Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
googletest
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
googletest
Commits
ab29bb6f
Commit
ab29bb6f
authored
Apr 08, 2011
by
vladlosev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removes commas from last items in enums (a C++ standard compliance fix).
parent
52277c91
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
gmock-spec-builders.h
include/gmock/gmock-spec-builders.h
+3
-3
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 {
...
@@ -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 {
...
@@ -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 {
...
@@ -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
;
...
...
include/gmock/internal/gmock-internal-utils.h
View file @
ab29bb6f
...
@@ -305,7 +305,7 @@ inline void Expect(bool condition, const char* file, int line) {
...
@@ -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.
...
...
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