diff options
| author | Derek Mauro <dmauro@google.com> | 2022-06-16 13:17:57 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2022-06-16 13:18:32 -0700 |
| commit | 86add13493e5c881d7e4ba77fb91c1f57752b3a4 (patch) | |
| tree | b9a8901984c0d9a46a5415985e04ed948030a787 | |
| parent | 191ca1f3a9262b90a586ae2c2e8c742c3d867801 (diff) | |
| download | googletest-git-86add13493e5c881d7e4ba77fb91c1f57752b3a4.tar.gz | |
Disable warning C4251 around refactored code
PiperOrigin-RevId: 455452553
Change-Id: I1dc3772ae61daf6d2d39484a0b1aad7eb0134525
| -rw-r--r-- | googletest/include/gtest/gtest-assertion-result.h | 5 | ||||
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/googletest/include/gtest/gtest-assertion-result.h b/googletest/include/gtest/gtest-assertion-result.h index e020c489..addbb59c 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 e52d8a78..0003d276 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 |