diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-31 14:50:06 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-31 14:50:06 (GMT) |
| commit | 4005388b3b48e29e91ccd648addaa10ded1b5bf0 (patch) | |
| tree | 5fc045ddda62d1fad7ad91028d444c6047012061 /googletest/test/googletest-output-test_.cc | |
| parent | b8e2562086ef326a4a88089f85b29ce7b6f9464b (diff) | |
| parent | 6dd60ec437e839b9fa5af2cebf2c1c62de08cdff (diff) | |
| download | googletest-4005388b3b48e29e91ccd648addaa10ded1b5bf0.zip googletest-4005388b3b48e29e91ccd648addaa10ded1b5bf0.tar.gz googletest-4005388b3b48e29e91ccd648addaa10ded1b5bf0.tar.bz2 | |
Merge pull request #1799 from google/9A681768AABE08D1EFA5CA77528236A4
Googletest export
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(); } |