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
dbd206e3
Commit
dbd206e3
authored
Apr 06, 2018
by
Gennadiy Civil
Browse files
more mcvs fixing
parent
701e1e5d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
0 deletions
+12
-0
googlemock/src/gmock-spec-builders.cc
googlemock/src/gmock-spec-builders.cc
+12
-0
No files found.
googlemock/src/gmock-spec-builders.cc
View file @
dbd206e3
...
...
@@ -49,6 +49,14 @@
# include <unistd.h> // NOLINT
#endif
// Silence C4800 (C4800: 'int *const ': forcing value
// to bool 'true' or 'false') for MSVC 14
#ifdef _MSC_VER && _MSC_VER == 1900
# pragma warning(push)
# pragma warning(disable:4800)
#endif
namespace
testing
{
namespace
internal
{
...
...
@@ -866,3 +874,7 @@ InSequence::~InSequence() {
}
}
// namespace testing
#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