diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-09 15:22:11 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-09 15:22:11 (GMT) |
| commit | c4e3d77ddc155a32e9f98f64ea1e111a5cce0e43 (patch) | |
| tree | c018608d18192acead4af72f678d5582ef7af87f /googlemock | |
| parent | 6525044ce20c22974d9eeaa1726b826c521fa84e (diff) | |
| download | googletest-c4e3d77ddc155a32e9f98f64ea1e111a5cce0e43.zip googletest-c4e3d77ddc155a32e9f98f64ea1e111a5cce0e43.tar.gz googletest-c4e3d77ddc155a32e9f98f64ea1e111a5cce0e43.tar.bz2 | |
More msvc 14
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/test/gmock-actions_test.cc | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/googlemock/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc index ea6129d..f8b9a1e 100644 --- a/googlemock/test/gmock-actions_test.cc +++ b/googlemock/test/gmock-actions_test.cc @@ -43,6 +43,16 @@ #include "gtest/gtest.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 { // This list should be kept sorted. @@ -1556,3 +1566,9 @@ TEST(MoveOnlyArgumentsTest, ReturningActions) { #endif // GTEST_LANG_CXX11 } // Unnamed namespace + +#ifdef _MSC_VER +#if _MSC_VER == 1900 +# pragma warning(pop) +#endif +#endif |