Moves the universal printer from gmock to gtest and refactors the cmake script for reusing in gmock (by Vlad Losev).

1 files changed, 2 insertions, 12 deletions

diff --git a/include/gtest/gtest.h b/include/gtest/gtest.h
index d0277246..4599aba1 100644
--- a/include/gtest/gtest.h
+++ b/include/gtest/gtest.h
@@ -59,6 +59,7 @@
 #include <gtest/gtest-death-test.h>
 #include <gtest/gtest-message.h>
 #include <gtest/gtest-param-test.h>
+#include <gtest/gtest-printers.h>
 #include <gtest/gtest_prod.h>
 #include <gtest/gtest-test-part.h>
 #include <gtest/gtest-typed-test.h>
@@ -1926,17 +1927,6 @@ GTEST_API_ AssertionResult DoubleLE(const char* expr1, const char* expr2,
   ::testing::internal::ScopedTrace GTEST_CONCAT_TOKEN_(gtest_trace_, __LINE__)(\
     __FILE__, __LINE__, ::testing::Message() << (message))
 
-namespace internal {
-
-// This template is declared, but intentionally undefined.
-template <typename T1, typename T2>
-struct StaticAssertTypeEqHelper;
-
-template <typename T>
-struct StaticAssertTypeEqHelper<T, T> {};
-
-}  // namespace internal
-
 // Compile-time assertion for type equality.
 // StaticAssertTypeEq<type1, type2>() compiles iff type1 and type2 are
 // the same type.  The value it returns is not interesting.
@@ -1969,7 +1959,7 @@ struct StaticAssertTypeEqHelper<T, T> {};
 // to cause a compiler error.
 template <typename T1, typename T2>
 bool StaticAssertTypeEq() {
-  (void)internal::StaticAssertTypeEqHelper<T1, T2>();
+  internal::StaticAssertTypeEqHelper<T1, T2>();
   return true;
 }