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/include | |
| 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/include')
| -rw-r--r-- | googletest/include/gtest/gtest-typed-test.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/include/gtest/gtest-typed-test.h b/googletest/include/gtest/gtest-typed-test.h index ea31567..74bce46 100644 --- a/googletest/include/gtest/gtest-typed-test.h +++ b/googletest/include/gtest/gtest-typed-test.h @@ -96,7 +96,7 @@ TYPED_TEST(FooTest, HasPropertyA) { ... } // static std::string GetName(int) { // if (std::is_same<T, char>()) return "char"; // if (std::is_same<T, int>()) return "int"; -// if (std::is_same<T, unsigned int>()) return "unsigned_int"; +// if (std::is_same<T, unsigned int>()) return "unsignedInt"; // } // }; // TYPED_TEST_CASE(FooTest, MyTypes, MyTypeNames); |