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 /googletest/include/gtest/gtest.h | |
| parent | 216c37f057ae0fff38062984c890df912f40ccf6 (diff) | |
| download | googletest-f31bf1d362afa1eba7efdc5bc0a33b0e814ce43a.tar.gz googletest-f31bf1d362afa1eba7efdc5bc0a33b0e814ce43a.tar.bz2 googletest-f31bf1d362afa1eba7efdc5bc0a33b0e814ce43a.zip | |
Googletest export
Replace testing::internal::ImplicitlyConvertible with std::is_convertible
Fixes #2054
PiperOrigin-RevId: 228334305
Diffstat (limited to 'googletest/include/gtest/gtest.h')
| -rw-r--r-- | googletest/include/gtest/gtest.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h index a0df29e2..3c725751 100644 --- a/googletest/include/gtest/gtest.h +++ b/googletest/include/gtest/gtest.h @@ -306,7 +306,7 @@ class GTEST_API_ AssertionResult { explicit AssertionResult( const T& success, typename internal::EnableIf< - !internal::ImplicitlyConvertible<T, AssertionResult>::value>::type* + !std::is_convertible<T, AssertionResult>::value>::type* /*enabler*/ = nullptr) : success_(success) {} |