diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-03-05 01:16:12 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-03-05 01:16:12 +0000 |
| commit | 66d8d6b9c4e8af839780a7241e596eaee5ae1956 (patch) | |
| tree | 506d3cc6e9b9ac6a5dd8f9c1e7eb5a6120c7d5bc | |
| parent | 595d200f4c1a88a1ed4d255f26341f94d8f2acb4 (diff) | |
| download | googletest-66d8d6b9c4e8af839780a7241e596eaee5ae1956.tar.gz | |
Fixes non-conforming uses of commas in enums s.t. the code compiles on
Sun OS. Patch by Hady Zalek.
git-svn-id: http://googletest.googlecode.com/svn/trunk@552 861a406c-534a-0410-8894-cb66d6ee9925
| -rw-r--r-- | test/gtest-printers_test.cc | 4 | ||||
| -rw-r--r-- | test/gtest_unittest.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/gtest-printers_test.cc b/test/gtest-printers_test.cc index 9aba39a..8992a9a 100644 --- a/test/gtest-printers_test.cc +++ b/test/gtest-printers_test.cc @@ -74,7 +74,7 @@ enum EnumWithoutPrinter { // An enum with a << operator. enum EnumWithStreaming { - kEWS1 = 10, + kEWS1 = 10 }; std::ostream& operator<<(std::ostream& os, EnumWithStreaming e) { @@ -83,7 +83,7 @@ std::ostream& operator<<(std::ostream& os, EnumWithStreaming e) { // An enum with a PrintTo() function. enum EnumWithPrintTo { - kEWPT1 = 1, + kEWPT1 = 1 }; void PrintTo(EnumWithPrintTo e, std::ostream* os) { diff --git a/test/gtest_unittest.cc b/test/gtest_unittest.cc index 3f0456e..e6619d5 100644 --- a/test/gtest_unittest.cc +++ b/test/gtest_unittest.cc @@ -3811,7 +3811,7 @@ TEST(AssertionTest, ExpectWorksWithUncopyableObject) { enum NamedEnum { kE1 = 0, - kE2 = 1, + kE2 = 1 }; TEST(AssertionTest, NamedEnum) { |