diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-09 13:51:01 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-09 13:51:01 -0400 |
| commit | e93a0ece26844351da7cdc675a55a2520412134d (patch) | |
| tree | 52c7ddef2afabdc3d4e61350f3a846abffa71054 /googlemock/test | |
| parent | c4684b49cf0d4334dfb522fcb3c8012cb63a4f61 (diff) | |
| download | googletest-e93a0ece26844351da7cdc675a55a2520412134d.tar.gz googletest-e93a0ece26844351da7cdc675a55a2520412134d.tar.bz2 googletest-e93a0ece26844351da7cdc675a55a2520412134d.zip | |
msvc
Diffstat (limited to 'googlemock/test')
| -rw-r--r-- | googlemock/test/gmock-actions_test.cc | 13 | ||||
| -rw-r--r-- | googlemock/test/gmock_all_test.cc | 12 |
2 files changed, 13 insertions, 12 deletions
diff --git a/googlemock/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc index ea6129d7..cd517a7d 100644 --- a/googlemock/test/gmock-actions_test.cc +++ b/googlemock/test/gmock-actions_test.cc @@ -33,6 +33,13 @@ // // This file tests the built-in actions. +#ifdef _MSC_VER +#if _MSC_VER <= 1900 +# pragma warning(push) +# pragma warning(disable:4800) +#endif +#endif + #include "gmock/gmock-actions.h" #include <algorithm> #include <iterator> @@ -1556,3 +1563,9 @@ TEST(MoveOnlyArgumentsTest, ReturningActions) { #endif // GTEST_LANG_CXX11 } // Unnamed namespace + +#ifdef _MSC_VER +#if _MSC_VER == 1900 +# pragma warning(pop) +#endif +#endif diff --git a/googlemock/test/gmock_all_test.cc b/googlemock/test/gmock_all_test.cc index bb87729e..fa9d84b6 100644 --- a/googlemock/test/gmock_all_test.cc +++ b/googlemock/test/gmock_all_test.cc @@ -38,13 +38,6 @@ // below list of actual *_test.cc files might change). // 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 - #include "test/gmock-actions_test.cc" #include "test/gmock-cardinalities_test.cc" #include "test/gmock-generated-actions_test.cc" @@ -59,8 +52,3 @@ #include "test/gmock-spec-builders_test.cc" #include "test/gmock_test.cc" -#ifdef _MSC_VER -#if _MSC_VER == 1900 -# pragma warning(pop) -#endif -#endif |