diff options
| author | misterg <misterg@google.com> | 2019-01-08 11:26:35 -0500 |
|---|---|---|
| committer | gennadiycivil <misterg@google.com> | 2019-01-08 11:51:05 -0500 |
| commit | f31bf1d362afa1eba7efdc5bc0a33b0e814ce43a (patch) | |
| tree | 6a030e7f683990a694c1737356b268b8b539db58 /googlemock | |
| parent | 216c37f057ae0fff38062984c890df912f40ccf6 (diff) | |
| download | googletest-f31bf1d362afa1eba7efdc5bc0a33b0e814ce43a.tar.gz googletest-f31bf1d362afa1eba7efdc5bc0a33b0e814ce43a.zip | |
Googletest export
Replace testing::internal::ImplicitlyConvertible with std::is_convertible
Fixes #2054
PiperOrigin-RevId: 228334305
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index b99fdc36..56804f39 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -128,9 +128,9 @@ class MatcherCastImpl { return CastImpl( polymorphic_matcher_or_value, BooleanConstant< - internal::ImplicitlyConvertible<M, Matcher<T> >::value>(), + std::is_convertible<M, Matcher<T> >::value>(), BooleanConstant< - internal::ImplicitlyConvertible<M, T>::value>()); + std::is_convertible<M, T>::value>()); } private: @@ -268,8 +268,8 @@ class SafeMatcherCastImpl { template <typename U> static inline Matcher<T> Cast(const Matcher<U>& matcher) { // Enforce that T can be implicitly converted to U. - GTEST_COMPILE_ASSERT_((internal::ImplicitlyConvertible<T, U>::value), - T_must_be_implicitly_convertible_to_U); + GTEST_COMPILE_ASSERT_((std::is_convertible<T, U>::value), + "T must be implicitly convertible to U"); // Enforce that we are not converting a non-reference type T to a reference // type U. GTEST_COMPILE_ASSERT_( |
