Skip to content

GitLab

Commit a5cc7aa3 authored by misterg's avatar misterg Committed by Gennadiy Civil
Browse files

Googletest export 

Fix broken OSS windows build.

PiperOrigin-RevId: 210969049
parent 41b53994
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
googlemock/include/gmock/gmock-matchers.h
View file @ a5cc7aa3
...@@ -56,8 +56,10 @@ ...@@ -56,8 +56,10 @@
# include <initializer_list> // NOLINT -- must be after gtest.h # include <initializer_list> // NOLINT -- must be after gtest.h
#endif #endif
GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \ GTEST_DISABLE_MSC_WARNINGS_PUSH_(
/* class A needs to have dll-interface to be used by clients of class B */) 4251 5046 /* class A needs to have dll-interface to be used by clients of
class B */
/* Symbol involving type with internal linkage not defined */)
namespace testing { namespace testing {
...@@ -5270,7 +5272,7 @@ PolymorphicMatcher<internal::variant_matcher::VariantMatcher<T> > VariantWith( ...@@ -5270,7 +5272,7 @@ PolymorphicMatcher<internal::variant_matcher::VariantMatcher<T> > VariantWith(
} // namespace testing } // namespace testing
GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251 GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251 5046
// Include any custom callback matchers added by the local installation. // Include any custom callback matchers added by the local installation.
// We must include this header at the end to make sure it can use the // We must include this header at the end to make sure it can use the
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment