diff options
| author | Tom Hughes <tomhughes@google.com> | 2023-01-30 21:44:59 (GMT) |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-01-30 21:45:46 (GMT) |
| commit | 4fb7039fda3f6588c7ca9664176f8c9e0a023b4a (patch) | |
| tree | 5b66c8479ecb9fd98b4b790c0aaebe1a7b7fb0e9 /googlemock/test/gmock-actions_test.cc | |
| parent | f1c05d4544964b060460a683c1cf31e02f0ba094 (diff) | |
| download | googletest-4fb7039fda3f6588c7ca9664176f8c9e0a023b4a.zip googletest-4fb7039fda3f6588c7ca9664176f8c9e0a023b4a.tar.gz googletest-4fb7039fda3f6588c7ca9664176f8c9e0a023b4a.tar.bz2 | |
Use GTEST_DISABLE_MSC_WARNINGS macros to disable warnings
Prior to this change we had a mixture of pragmas and
GTEST_DISABLE_MSC_WARNINGS; this change consolidates all instances
to use the macros.
PiperOrigin-RevId: 505786926
Change-Id: I2be8f6304387393995081af42ed32c2ad1bba5a7
Diffstat (limited to 'googlemock/test/gmock-actions_test.cc')
| -rw-r--r-- | googlemock/test/gmock-actions_test.cc | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/googlemock/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc index 295470e..f2d3042 100644 --- a/googlemock/test/gmock-actions_test.cc +++ b/googlemock/test/gmock-actions_test.cc @@ -31,19 +31,6 @@ // // This file tests the built-in actions. -// Silence C4100 (unreferenced formal parameter) and C4503 (decorated name -// length exceeded) for MSVC. -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable : 4100) -#pragma warning(disable : 4503) -#if _MSC_VER == 1900 -// and silence C4800 (C4800: 'int *const ': forcing value -// to bool 'true' or 'false') for MSVC 15 -#pragma warning(disable : 4800) -#endif -#endif - #include "gmock/gmock-actions.h" #include <algorithm> @@ -59,6 +46,15 @@ #include "gtest/gtest-spi.h" #include "gtest/gtest.h" +// Silence C4100 (unreferenced formal parameter) and C4503 (decorated name +// length exceeded) for MSVC. +GTEST_DISABLE_MSC_WARNINGS_PUSH_(4100 4503) +#if defined(_MSC_VER) && (_MSC_VER == 1900) +// and silence C4800 (C4800: 'int *const ': forcing value +// to bool 'true' or 'false') for MSVC 15 +GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800) +#endif + namespace testing { namespace { @@ -2165,3 +2161,8 @@ TEST(ActionMacro, LargeArity) { } // namespace } // namespace testing + +#if defined(_MSC_VER) && (_MSC_VER == 1900) +GTEST_DISABLE_MSC_WARNINGS_POP_() // 4800 +#endif +GTEST_DISABLE_MSC_WARNINGS_POP_() // 4100 4503 |