diff options
author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-05-10 17:11:58 (GMT) |
---|---|---|
committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-05-10 17:11:58 (GMT) |
commit | 2ccea88c99d1ae23383d1b8eb3680a4a4d2edd66 (patch) | |
tree | 1e633f4afd1e86e367d7d10cb0467fc910d03464 /include/gtest/gtest.h | |
parent | cdc0aae155e9069eeebcb191570b8cb1b258ecd8 (diff) | |
download | googletest-2ccea88c99d1ae23383d1b8eb3680a4a4d2edd66.zip googletest-2ccea88c99d1ae23383d1b8eb3680a4a4d2edd66.tar.gz googletest-2ccea88c99d1ae23383d1b8eb3680a4a4d2edd66.tar.bz2 |
Moves the universal printer from gmock to gtest and refactors the cmake script for reusing in gmock (by Vlad Losev).
Diffstat (limited to 'include/gtest/gtest.h')
-rw-r--r-- | include/gtest/gtest.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/include/gtest/gtest.h b/include/gtest/gtest.h index d027724..4599aba 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; } |