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
03be5df1
Commit
03be5df1
authored
Apr 09, 2018
by
Gennadiy Civil
Browse files
cont.
parent
e0b3c269
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
googlemock/src/gmock-spec-builders.cc
googlemock/src/gmock-spec-builders.cc
+2
-2
No files found.
googlemock/src/gmock-spec-builders.cc
View file @
03be5df1
...
...
@@ -51,7 +51,7 @@
// Silence C4800 (C4800: 'int *const ': forcing value
// to bool 'true' or 'false') for MSVC 14
#ifdef _MSC_VER && _MSC_VER == 1900
#ifdef
(
_MSC_VER && _MSC_VER == 1900
)
# pragma warning(push)
# pragma warning(disable:4800)
#endif
...
...
@@ -874,6 +874,6 @@ InSequence::~InSequence() {
}
// namespace testing
#ifdef _MSC_VER && _MSC_VER == 1900
#ifdef
(
_MSC_VER && _MSC_VER == 1900
)
# pragma warning(pop)
#endif
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