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-matchers-misc_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-matchers-misc_test.cc')
| -rw-r--r-- | googlemock/test/gmock-matchers-misc_test.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/googlemock/test/gmock-matchers-misc_test.cc b/googlemock/test/gmock-matchers-misc_test.cc index 1d1bfb9..c1e4f35 100644 --- a/googlemock/test/gmock-matchers-misc_test.cc +++ b/googlemock/test/gmock-matchers-misc_test.cc @@ -31,13 +31,11 @@ // // This file tests some commonly used argument matchers. +#include "gtest/gtest.h" + // Silence warning C4244: 'initializing': conversion from 'int' to 'short', // possible loss of data and C4100, unreferenced local parameter -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable : 4244) -#pragma warning(disable : 4100) -#endif +GTEST_DISABLE_MSC_WARNINGS_PUSH_(4244 4100) #include "test/gmock-matchers_test.h" @@ -1814,6 +1812,4 @@ TEST(ThrowsPredicateCompilesTest, MessageMatcherAcceptsNonMatcher) { } // namespace gmock_matchers_test } // namespace testing -#ifdef _MSC_VER -#pragma warning(pop) -#endif +GTEST_DISABLE_MSC_WARNINGS_POP_() // 4244 4100 |