From 86add13493e5c881d7e4ba77fb91c1f57752b3a4 Mon Sep 17 00:00:00 2001 From: Derek Mauro Date: Thu, 16 Jun 2022 13:17:57 -0700 Subject: Disable warning C4251 around refactored code PiperOrigin-RevId: 455452553 Change-Id: I1dc3772ae61daf6d2d39484a0b1aad7eb0134525 --- googletest/include/gtest/gtest-assertion-result.h | 5 +++++ googletest/include/gtest/internal/gtest-port.h | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/googletest/include/gtest/gtest-assertion-result.h b/googletest/include/gtest/gtest-assertion-result.h index e020c48..addbb59 100644 --- a/googletest/include/gtest/gtest-assertion-result.h +++ b/googletest/include/gtest/gtest-assertion-result.h @@ -46,6 +46,9 @@ #include "gtest/gtest-message.h" #include "gtest/internal/gtest-port.h" +GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \ +/* class A needs to have dll-interface to be used by clients of class B */) + namespace testing { // A class for indicating whether an assertion was successful. When @@ -229,4 +232,6 @@ GTEST_API_ AssertionResult AssertionFailure(const Message& msg); } // namespace testing +GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251 + #endif // GOOGLETEST_INCLUDE_GTEST_GTEST_ASSERTION_RESULT_H_ diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index e52d8a7..0003d27 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -1200,6 +1200,9 @@ class GTEST_API_ AutoHandle { // Nothing to do here. #else +GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \ +/* class A needs to have dll-interface to be used by clients of class B */) + // Allows a controller thread to pause execution of newly created // threads until notified. Instances of this class must be created // and destroyed in the controller thread. @@ -1233,6 +1236,7 @@ class GTEST_API_ Notification { std::condition_variable cv_; bool notified_; }; +GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251 #endif // GTEST_HAS_NOTIFICATION_ // On MinGW, we can have both GTEST_OS_WINDOWS and GTEST_HAS_PTHREAD -- cgit v0.12