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/gmock-matchers_test.cc | |
| 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/gmock-matchers_test.cc')
| -rw-r--r-- | googlemock/test/gmock-matchers_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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> |