From f31bf1d362afa1eba7efdc5bc0a33b0e814ce43a Mon Sep 17 00:00:00 2001
From: misterg <misterg@google.com>
Date: Tue, 8 Jan 2019 11:26:35 -0500
Subject: Googletest export

Replace testing::internal::ImplicitlyConvertible with std::is_convertible
Fixes #2054

PiperOrigin-RevId: 228334305
---
 googletest/include/gtest/gtest-printers.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'googletest/include/gtest/gtest-printers.h')

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
                                          :
-- 
cgit v1.2.1