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-printers.h | |
| 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 'googletest/include/gtest/gtest-printers.h')
| -rw-r--r-- | googletest/include/gtest/gtest-printers.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googletest/include/gtest/gtest-printers.h b/googletest/include/gtest/gtest-printers.h index d6596e48..9048459e 100644 --- a/googletest/include/gtest/gtest-printers.h +++ b/googletest/include/gtest/gtest-printers.h @@ -232,12 +232,12 @@ template <typename Char, typename CharTraits, typename T> ::std::basic_ostream<Char, CharTraits>& os, const T& x) { TypeWithoutFormatter<T, (internal::IsAProtocolMessage<T>::value ? kProtobuf - : internal::ImplicitlyConvertible< + : std::is_convertible< const T&, internal::BiggestInt>::value ? kConvertibleToInteger : #if GTEST_HAS_ABSL - internal::ImplicitlyConvertible< + std::is_convertible< const T&, absl::string_view>::value ? kConvertibleToStringView : |
