Skip to content

GitLab

Commit 66ac4909 authored by zhanyong.wan's avatar zhanyong.wan
Browse files

Fixes non-conforming uses of commas in enums s.t. the code compiles on 

Sun OS. Patch by Hady Zalek.
parent f4419791
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
test/gtest-printers_test.cc
View file @ 66ac4909
...@@ -74,7 +74,7 @@ enum EnumWithoutPrinter { ...@@ -74,7 +74,7 @@ enum EnumWithoutPrinter {
// An enum with a << operator. // An enum with a << operator.
enum EnumWithStreaming { enum EnumWithStreaming {
kEWS1 = 10, kEWS1 = 10
}; };
std::ostream& operator<<(std::ostream& os, EnumWithStreaming e) { std::ostream& operator<<(std::ostream& os, EnumWithStreaming e) {
...@@ -83,7 +83,7 @@ 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. // An enum with a PrintTo() function.
enum EnumWithPrintTo { enum EnumWithPrintTo {
kEWPT1 = 1, kEWPT1 = 1
}; };
void PrintTo(EnumWithPrintTo e, std::ostream* os) { void PrintTo(EnumWithPrintTo e, std::ostream* os) {
......
test/gtest_unittest.cc
View file @ 66ac4909
...@@ -3811,7 +3811,7 @@ TEST(AssertionTest, ExpectWorksWithUncopyableObject) { ...@@ -3811,7 +3811,7 @@ TEST(AssertionTest, ExpectWorksWithUncopyableObject) {
enum NamedEnum { enum NamedEnum {
kE1 = 0, kE1 = 0,
kE2 = 1, kE2 = 1
}; };
TEST(AssertionTest, NamedEnum) { TEST(AssertionTest, NamedEnum) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment