From ab29bb6fcd992d76625a139418e80599cd2c8823 Mon Sep 17 00:00:00 2001 From: vladlosev Date: Fri, 8 Apr 2011 01:32:32 +0000 Subject: [PATCH] Removes commas from last items in enums (a C++ standard compliance fix). --- include/gmock/gmock-spec-builders.h | 6 +++--- 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 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.