diff options
| author | Abseil Team <absl-team@google.com> | 2019-10-21 10:56:09 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-10-22 09:38:12 -0400 |
| commit | 611a321a6e641846497f75375f9cbe7825ff3f23 (patch) | |
| tree | 19772533815c9132759f5b527d023eb30b997246 /googletest/include/gtest/internal | |
| parent | a5216dd1a9f392ad1084a4944f87ff48c82ee3d2 (diff) | |
| download | googletest-611a321a6e641846497f75375f9cbe7825ff3f23.tar.gz googletest-611a321a6e641846497f75375f9cbe7825ff3f23.tar.bz2 googletest-611a321a6e641846497f75375f9cbe7825ff3f23.zip | |
Googletest export
Remove bool_constant in favor of std::integral_constant<bool, ...>;
The one non-trivial use of bool_constant has been changed to have significantly
fewer template specializations.
PiperOrigin-RevId: 275842490
Diffstat (limited to 'googletest/include/gtest/internal')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-internal.h | 3 | ||||
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/googletest/include/gtest/internal/gtest-internal.h b/googletest/include/gtest/internal/gtest-internal.h index ebfe3c9d..95242232 100644 --- a/googletest/include/gtest/internal/gtest-internal.h +++ b/googletest/include/gtest/internal/gtest-internal.h @@ -855,8 +855,7 @@ class GTEST_API_ Random { // true if and only if T is type proto2::Message or a subclass of it. template <typename T> struct IsAProtocolMessage - : public bool_constant< - std::is_convertible<const T*, const ::proto2::Message*>::value> {}; + : public std::is_convertible<const T*, const ::proto2::Message*> {}; // When the compiler sees expression IsContainerTest<C>(0), if C is an // STL-style container class, the first overload of IsContainerTest diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index c4b1aabe..dc67902b 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -1875,9 +1875,6 @@ class GTEST_API_ ThreadLocal { // we cannot detect it. GTEST_API_ size_t GetThreadCount(); -template <bool B> -using bool_constant = std::integral_constant<bool, B>; - #if GTEST_OS_WINDOWS # define GTEST_PATH_SEP_ "\\" # define GTEST_HAS_ALT_PATH_SEP_ 1 |