diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-09 17:51:01 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-09 17:51:01 (GMT) |
| commit | e93a0ece26844351da7cdc675a55a2520412134d (patch) | |
| tree | 52c7ddef2afabdc3d4e61350f3a846abffa71054 /googlemock/test/gmock-actions_test.cc | |
| parent | c4684b49cf0d4334dfb522fcb3c8012cb63a4f61 (diff) | |
| download | googletest-e93a0ece26844351da7cdc675a55a2520412134d.zip googletest-e93a0ece26844351da7cdc675a55a2520412134d.tar.gz googletest-e93a0ece26844351da7cdc675a55a2520412134d.tar.bz2 | |
msvc
Diffstat (limited to 'googlemock/test/gmock-actions_test.cc')
| -rw-r--r-- | googlemock/test/gmock-actions_test.cc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/googlemock/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc index ea6129d..cd517a7 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 |