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/include/gmock/gmock-more-actions.h | |
| 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/include/gmock/gmock-more-actions.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-more-actions.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/googlemock/include/gmock/gmock-more-actions.h b/googlemock/include/gmock/gmock-more-actions.h index 78169b1..4030076 100644 --- a/googlemock/include/gmock/gmock-more-actions.h +++ b/googlemock/include/gmock/gmock-more-actions.h @@ -583,10 +583,7 @@ namespace testing { // the macro definition, as the warnings are generated when the macro // is expanded and macro expansion cannot contain #pragma. Therefore // we suppress them here. -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable : 4100) -#endif +GTEST_DISABLE_MSC_WARNINGS_PUSH_(4100) namespace internal { @@ -654,9 +651,7 @@ InvokeArgument(Params &&...params) { internal::FlatTupleConstructTag{}, std::forward<Params>(params)...)}; } -#ifdef _MSC_VER -#pragma warning(pop) -#endif +GTEST_DISABLE_MSC_WARNINGS_POP_() // 4100 } // namespace testing |