Skip to content

GitLab

Commit c4e3d77d authored by Gennadiy Civil's avatar Gennadiy Civil
Browse files 

More msvc 14
parent 6525044c
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 0 deletions
googlemock/test/gmock-actions_test.cc
View file @ c4e3d77d
...@@ -43,6 +43,16 @@ ...@@ -43,6 +43,16 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "gtest/gtest-spi.h" #include "gtest/gtest-spi.h"
// Silence C4800 (C4800: 'int *const ': forcing value
// to bool 'true' or 'false') for MSVC 14,15
#ifdef _MSC_VER
#if _MSC_VER <= 1900
# pragma warning(push)
# pragma warning(disable:4800)
#endif
#endif
namespace { namespace {
// This list should be kept sorted. // This list should be kept sorted.
...@@ -1556,3 +1566,9 @@ TEST(MoveOnlyArgumentsTest, ReturningActions) { ...@@ -1556,3 +1566,9 @@ TEST(MoveOnlyArgumentsTest, ReturningActions) {
#endif // GTEST_LANG_CXX11 #endif // GTEST_LANG_CXX11
} // Unnamed namespace } // Unnamed namespace
#ifdef _MSC_VER
#if _MSC_VER == 1900
# pragma warning(pop)
#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