diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-08-15 17:34:18 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-08-15 17:34:18 -0400 |
| commit | 9b70406919faddd764cb73b9d0ebb118c0a386ea (patch) | |
| tree | eaa9cd450a7729b5c867221dbff8fdc1243f7e1b /googlemock/test | |
| parent | 6aba4a5c45c03c2367c3390708c049fa8bc14487 (diff) | |
| parent | ec49fbca4cb84651fb2eae5d093d0342f356cf29 (diff) | |
| download | googletest-9b70406919faddd764cb73b9d0ebb118c0a386ea.tar.gz googletest-9b70406919faddd764cb73b9d0ebb118c0a386ea.tar.bz2 googletest-9b70406919faddd764cb73b9d0ebb118c0a386ea.zip | |
Merge pull request #2399 from kuzkry:custom-type-traits-is_same
PiperOrigin-RevId: 263568712
Diffstat (limited to 'googlemock/test')
| -rw-r--r-- | googlemock/test/gmock-internal-utils_test.cc | 18 | ||||
| -rw-r--r-- | googlemock/test/gmock-matchers_test.cc | 2 |
2 files changed, 7 insertions, 13 deletions
diff --git a/googlemock/test/gmock-internal-utils_test.cc b/googlemock/test/gmock-internal-utils_test.cc index a76e777c..cee13e90 100644 --- a/googlemock/test/gmock-internal-utils_test.cc +++ b/googlemock/test/gmock-internal-utils_test.cc @@ -38,6 +38,7 @@ #include <memory> #include <string> #include <sstream> +#include <type_traits> #include <vector> #include "gmock/gmock.h" #include "gmock/internal/gmock-port.h" @@ -518,19 +519,12 @@ TEST(TypeTraitsTest, is_reference) { EXPECT_TRUE(is_reference<const int&>::value); } -TEST(TypeTraitsTest, type_equals) { - EXPECT_FALSE((type_equals<int, const int>::value)); - EXPECT_FALSE((type_equals<int, int&>::value)); - EXPECT_FALSE((type_equals<int, double>::value)); - EXPECT_TRUE((type_equals<char, char>::value)); -} - TEST(TypeTraitsTest, remove_reference) { - EXPECT_TRUE((type_equals<char, remove_reference<char&>::type>::value)); - EXPECT_TRUE((type_equals<const int, - remove_reference<const int&>::type>::value)); - EXPECT_TRUE((type_equals<int, remove_reference<int>::type>::value)); - EXPECT_TRUE((type_equals<double*, remove_reference<double*>::type>::value)); + EXPECT_TRUE((std::is_same<char, remove_reference<char&>::type>::value)); + EXPECT_TRUE( + (std::is_same<const int, remove_reference<const int&>::type>::value)); + EXPECT_TRUE((std::is_same<int, remove_reference<int>::type>::value)); + EXPECT_TRUE((std::is_same<double*, remove_reference<double*>::type>::value)); } #if GTEST_HAS_STREAM_REDIRECTION diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc index 74e9294f..a61d040b 100644 --- a/googlemock/test/gmock-matchers_test.cc +++ b/googlemock/test/gmock-matchers_test.cc @@ -6434,7 +6434,7 @@ class SampleVariantIntString { template <typename T> friend bool holds_alternative(const SampleVariantIntString& value) { - return value.has_int_ == internal::IsSame<T, int>::value; + return value.has_int_ == std::is_same<T, int>::value; } template <typename T> |