diff --git a/googletest/include/gtest/gtest-printers.h b/googletest/include/gtest/gtest-printers.h index 6703b303bdef9c395f45502dcec5c3c54917e01f..fad4e692515d55fd1883d8e959992d1074f1d0b2 100644 --- a/googletest/include/gtest/gtest-printers.h +++ b/googletest/include/gtest/gtest-printers.h @@ -518,11 +518,7 @@ void PrintTo(const T& value, ::std::ostream* os) { ? kPrintContainer : !is_pointer<T>::value ? kPrintOther -#if GTEST_LANG_CXX11 : std::is_function<typename std::remove_pointer<T>::type>::value -#else - : !internal::ImplicitlyConvertible<T, const void*>::value -#endif ? kPrintFunctionPointer : kPrintPointer > (), value, os); @@ -639,8 +635,6 @@ inline void PrintTo(absl::string_view sp, ::std::ostream* os) { } #endif // GTEST_HAS_ABSL -#if GTEST_LANG_CXX11 - inline void PrintTo(std::nullptr_t, ::std::ostream* os) { *os << "(nullptr)"; } template <typename T> @@ -649,8 +643,6 @@ void PrintTo(std::reference_wrapper<T> ref, ::std::ostream* os) { PrintTo(ref.get(), os); } -#endif // GTEST_LANG_CXX11 - #if GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_ // Helper function for printing a tuple. T must be instantiated with // a tuple type.