Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
ab29bb6f
Commit
ab29bb6f
authored
Apr 08, 2011
by
vladlosev
Browse files
Removes commas from last items in enums (a C++ standard compliance fix).
parent
52277c91
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
include/gmock/gmock-spec-builders.h
include/gmock/gmock-spec-builders.h
+3
-3
include/gmock/internal/gmock-internal-utils.h
include/gmock/internal/gmock-internal-utils.h
+1
-1
No files found.
include/gmock/gmock-spec-builders.h
View file @
ab29bb6f
...
...
@@ -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
;
...
...
include/gmock/internal/gmock-internal-utils.h
View file @
ab29bb6f
...
...
@@ -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.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment