Skip to content

GitLab

Commit 25d8176e authored by Gennadiy Civil's avatar Gennadiy Civil
Browse files

merging

parent 39c58da1
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 7 deletions
googlemock/src/gmock-spec-builders.cc
View file @ 25d8176e
...@@ -50,12 +50,13 @@ ...@@ -50,12 +50,13 @@
#endif #endif
// Silence C4800 (C4800: 'int *const ': forcing value // Silence C4800 (C4800: 'int *const ': forcing value
// to bool 'true' or 'false') for MSVC 14 // to bool 'true' or 'false') for MSVC 14,15
#ifdef _MSC_VER && _MSC_VER == 1900 #ifdef _MSC_VER
# pragma warning(push) #if _MSC_VER <= 1900
# pragma warning(disable:4800) # pragma warning(push)
# pragma warning(disable:4800)
#endif
#endif #endif
namespace testing { namespace testing {
namespace internal { namespace internal {
...@@ -875,6 +876,8 @@ InSequence::~InSequence() { ...@@ -875,6 +876,8 @@ InSequence::~InSequence() {
} // namespace testing } // namespace testing
#ifdef _MSC_VER && _MSC_VER == 1900 #ifdef _MSC_VER
# pragma warning(pop) #if _MSC_VER <= 1900
# pragma warning(pop)
#endif
#endif #endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment