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/internal | |
| 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/internal')
| -rw-r--r-- | googlemock/include/gmock/internal/gmock-internal-utils.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h index 36ab8e2..afbdce0 100644 --- a/googlemock/include/gmock/internal/gmock-internal-utils.h +++ b/googlemock/include/gmock/internal/gmock-internal-utils.h @@ -58,11 +58,7 @@ namespace internal { // Silence MSVC C4100 (unreferenced formal parameter) and // C4805('==': unsafe mix of type 'const int' and type 'const bool') -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable : 4100) -#pragma warning(disable : 4805) -#endif +GTEST_DISABLE_MSC_WARNINGS_PUSH_(4100 4805) // Joins a vector of strings as if they are fields of a tuple; returns // the joined string. @@ -480,9 +476,7 @@ using TupleElement = typename std::tuple_element<I, T>::type; bool Base64Unescape(const std::string& encoded, std::string* decoded); -#ifdef _MSC_VER -#pragma warning(pop) -#endif +GTEST_DISABLE_MSC_WARNINGS_POP_() // 4100 4805 } // namespace internal } // namespace testing |