diff options
| author | Gaspard Petit <gaspard.petit@eidosmontreal.com> | 2018-01-09 15:22:30 -0500 |
|---|---|---|
| committer | Gaspard Petit <gaspard.petit@eidosmontreal.com> | 2018-01-09 15:22:30 -0500 |
| commit | 5d96565ccc4b5bbd72100729361516de79b61353 (patch) | |
| tree | 93aa8a57b1f8015974c44a6e5ec5efa8d69ddbab /googletest/test/gtest_output_test_.cc | |
| parent | 8b491162f79282b79292e0f4166194b3f7ccb7b1 (diff) | |
| parent | 23015249236e60b94b5010330ef687de43d2e923 (diff) | |
| download | googletest-5d96565ccc4b5bbd72100729361516de79b61353.tar.gz googletest-5d96565ccc4b5bbd72100729361516de79b61353.tar.bz2 googletest-5d96565ccc4b5bbd72100729361516de79b61353.zip | |
Merge branch 'master' into support_xboxone
Diffstat (limited to 'googletest/test/gtest_output_test_.cc')
| -rw-r--r-- | googletest/test/gtest_output_test_.cc | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/googletest/test/gtest_output_test_.cc b/googletest/test/gtest_output_test_.cc index 1070a9f2..6aaba977 100644 --- a/googletest/test/gtest_output_test_.cc +++ b/googletest/test/gtest_output_test_.cc @@ -37,15 +37,7 @@ #include "gtest/gtest-spi.h" #include "gtest/gtest.h" - -// Indicates that this translation unit is part of Google Test's -// implementation. It must come before gtest-internal-inl.h is -// included, or there will be a compiler error. This trick is to -// prevent a user from accidentally including gtest-internal-inl.h in -// his code. -#define GTEST_IMPLEMENTATION_ 1 #include "src/gtest-internal-inl.h" -#undef GTEST_IMPLEMENTATION_ #include <stdlib.h> @@ -757,8 +749,6 @@ TEST(ExpectFatalFailureTest, FailsWhenStatementThrows) { // This #ifdef block tests the output of value-parameterized tests. -#if GTEST_HAS_PARAM_TEST - std::string ParamNameFunc(const testing::TestParamInfo<std::string>& info) { return info.param; } @@ -779,8 +769,6 @@ INSTANTIATE_TEST_CASE_P(PrintingStrings, testing::Values(std::string("a")), ParamNameFunc); -#endif // GTEST_HAS_PARAM_TEST - // This #ifdef block tests the output of typed tests. #if GTEST_HAS_TYPED_TEST |