generic-library/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removes commas from last items in enums (a C++ standard compliance fix).

Browse Source
This commit is contained in:
vladlosev 2011-04-08 01:32:32 +00:00
parent 52277c919e
commit ab29bb6fcd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/gmock/gmock-spec-builders.h
View File

@ -254,7 +254,7 @@ class UntypedOnCallSpecBase {
// syntax checking relies on it. // syntax checking relies on it.
kNone, kNone,
kWith, kWith,
kWillByDefault, kWillByDefault
}; };
// Asserts that the ON_CALL() statement has a certain property. // Asserts that the ON_CALL() statement has a certain property.
@ -357,7 +357,7 @@ class OnCallSpec : public UntypedOnCallSpecBase {
enum CallReaction { enum CallReaction {
ALLOW, ALLOW,
WARN, WARN,
FAIL, FAIL
}; };
} // namespace internal } // namespace internal
@ -715,7 +715,7 @@ class ExpectationBase {
kAfter, kAfter,
kWillOnce, kWillOnce,
kWillRepeatedly, kWillRepeatedly,
kRetiresOnSaturation, kRetiresOnSaturation
}; };
typedef std::vector<const void*> UntypedActions; typedef std::vector<const void*> UntypedActions;

2
include/gmock/internal/gmock-internal-utils.h
View File

@ -305,7 +305,7 @@ inline void Expect(bool condition, const char* file, int line) {
// Severity level of a log. // Severity level of a log.
enum LogSeverity { enum LogSeverity {
INFO = 0, INFO = 0,
WARNING = 1, WARNING = 1
}; };
// Valid values for the --gmock_verbose flag. // Valid values for the --gmock_verbose flag.