diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-31 14:57:16 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-31 14:57:16 (GMT) |
| commit | d615eebd9f056ca32c65b6971116a964f1e86230 (patch) | |
| tree | b3d198082be63f1de097a2ab503aeb51db019706 /googletest/test/googletest-output-test_.cc | |
| parent | 13c5230bbf2bd3404e48b7aee33a9af2514d1b9a (diff) | |
| parent | 4005388b3b48e29e91ccd648addaa10ded1b5bf0 (diff) | |
| download | googletest-d615eebd9f056ca32c65b6971116a964f1e86230.zip googletest-d615eebd9f056ca32c65b6971116a964f1e86230.tar.gz googletest-d615eebd9f056ca32c65b6971116a964f1e86230.tar.bz2 | |
Merge branch 'master' into fix-clang-warningsrefs/pull/1433/head
Diffstat (limited to 'googletest/test/googletest-output-test_.cc')
| -rw-r--r-- | googletest/test/googletest-output-test_.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/googletest/test/googletest-output-test_.cc b/googletest/test/googletest-output-test_.cc index 180630e..f6525ec 100644 --- a/googletest/test/googletest-output-test_.cc +++ b/googletest/test/googletest-output-test_.cc @@ -40,8 +40,8 @@ #include <stdlib.h> #if _MSC_VER - GTEST_DISABLE_MSC_WARNINGS_PUSH_(4127 /* conditional expression is constant */) -#endif // . _MSC_VER +GTEST_DISABLE_MSC_WARNINGS_PUSH_(4127 /* conditional expression is constant */) +#endif // _MSC_VER #if GTEST_IS_THREADSAFE using testing::ScopedFakeTestPartResultReporter; @@ -815,9 +815,9 @@ class TypedTestNames { template <typename T> static std::string GetName(int i) { if (testing::internal::IsSame<T, char>::value) - return std::string("char_") + ::testing::PrintToString(i); + return std::string("char") + ::testing::PrintToString(i); if (testing::internal::IsSame<T, int>::value) - return std::string("int_") + ::testing::PrintToString(i); + return std::string("int") + ::testing::PrintToString(i); } }; @@ -856,10 +856,10 @@ class TypedTestPNames { template <typename T> static std::string GetName(int i) { if (testing::internal::IsSame<T, unsigned char>::value) { - return std::string("unsigned_char_") + ::testing::PrintToString(i); + return std::string("unsignedChar") + ::testing::PrintToString(i); } if (testing::internal::IsSame<T, unsigned int>::value) { - return std::string("unsigned_int_") + ::testing::PrintToString(i); + return std::string("unsignedInt") + ::testing::PrintToString(i); } } }; @@ -1103,7 +1103,7 @@ int main(int argc, char **argv) { testing::AddGlobalTestEnvironment(new FooEnvironment); testing::AddGlobalTestEnvironment(new BarEnvironment); #if _MSC_VER - GTEST_DISABLE_MSC_WARNINGS_POP_() // 4127 -#endif // . _MSC_VER +GTEST_DISABLE_MSC_WARNINGS_POP_() // 4127 +#endif // _MSC_VER return RunAllTests(); } |