diff options
| author | vladlosev <vladlosev@8415998a-534a-0410-bf83-d39667b30386> | 2011-04-08 01:32:32 +0000 |
|---|---|---|
| committer | vladlosev <vladlosev@8415998a-534a-0410-bf83-d39667b30386> | 2011-04-08 01:32:32 +0000 |
| commit | ab29bb6fcd992d76625a139418e80599cd2c8823 (patch) | |
| tree | b36b7b91dc5440810dc9a9409c6364ac07e00bda | |
| parent | 52277c919e6cc47a6169d5bec48c0b03aecaa874 (diff) | |
| download | googletest-ab29bb6fcd992d76625a139418e80599cd2c8823.tar.gz googletest-ab29bb6fcd992d76625a139418e80599cd2c8823.tar.bz2 googletest-ab29bb6fcd992d76625a139418e80599cd2c8823.zip | |
Removes commas from last items in enums (a C++ standard compliance fix).
| -rw-r--r-- | include/gmock/gmock-spec-builders.h | 6 | ||||
| -rw-r--r-- | include/gmock/internal/gmock-internal-utils.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/gmock/gmock-spec-builders.h b/include/gmock/gmock-spec-builders.h index 6ae807a2..400d4d71 100644 --- a/include/gmock/gmock-spec-builders.h +++ b/include/gmock/gmock-spec-builders.h @@ -254,7 +254,7 @@ class UntypedOnCallSpecBase { // syntax checking relies on it. kNone, kWith, - kWillByDefault, + kWillByDefault }; // Asserts that the ON_CALL() statement has a certain property. @@ -357,7 +357,7 @@ class OnCallSpec : public UntypedOnCallSpecBase { enum CallReaction { ALLOW, WARN, - FAIL, + FAIL }; } // namespace internal @@ -715,7 +715,7 @@ class ExpectationBase { kAfter, kWillOnce, kWillRepeatedly, - kRetiresOnSaturation, + kRetiresOnSaturation }; typedef std::vector<const void*> UntypedActions; diff --git a/include/gmock/internal/gmock-internal-utils.h b/include/gmock/internal/gmock-internal-utils.h index 48fadba2..f0fd8682 100644 --- a/include/gmock/internal/gmock-internal-utils.h +++ b/include/gmock/internal/gmock-internal-utils.h @@ -305,7 +305,7 @@ inline void Expect(bool condition, const char* file, int line) { // Severity level of a log. enum LogSeverity { INFO = 0, - WARNING = 1, + WARNING = 1 }; // Valid values for the --gmock_verbose flag. |