summaryrefslogtreecommitdiffstats
path: root/googletest/include/gtest/gtest-printers.h
diff options
context:
space:
mode:
authormisterg <misterg@google.com>2018-10-05 14:52:02 -0400
committerGennadiy Civil <misterg@google.com>2018-10-05 15:17:01 -0400
commit07c4753a17fc372bb2027e28a51265a840002c91 (patch)
tree65cdc627d4095cbf53fd102651a1315e9c8e016b /googletest/include/gtest/gtest-printers.h
parentf8a1481c0a7c5c30c6ad32bb315e472b91df314b (diff)
downloadgoogletest-07c4753a17fc372bb2027e28a51265a840002c91.tar.gz
googletest-07c4753a17fc372bb2027e28a51265a840002c91.zip
Remove pre-C++11 code from gtest-printers
PiperOrigin-RevId: 215941759
Diffstat (limited to 'googletest/include/gtest/gtest-printers.h')
-rw-r--r--googletest/include/gtest/gtest-printers.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/googletest/include/gtest/gtest-printers.h b/googletest/include/gtest/gtest-printers.h
index 6703b303..fad4e692 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.
OpenPOWER on IntegriCloud