diff options
| author | misterg <misterg@google.com> | 2018-08-30 16:26:26 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-08-30 21:33:10 -0400 |
| commit | a5cc7aa3fe233111adbb05aacf03569a72fd6c3d (patch) | |
| tree | af20d4f98bd565b9e18a8ff2699e1974eb48a9fe /googlemock/include/gmock/gmock-matchers.h | |
| parent | 41b539941f8563e00dff5fc9d01510cb02d6467d (diff) | |
| download | googletest-a5cc7aa3fe233111adbb05aacf03569a72fd6c3d.tar.gz googletest-a5cc7aa3fe233111adbb05aacf03569a72fd6c3d.tar.bz2 googletest-a5cc7aa3fe233111adbb05aacf03569a72fd6c3d.zip | |
Googletest export
Fix broken OSS windows build.
PiperOrigin-RevId: 210969049
Diffstat (limited to 'googlemock/include/gmock/gmock-matchers.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index 3975cd07..a7bcfc83 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -56,8 +56,10 @@ # include <initializer_list> // NOLINT -- must be after gtest.h #endif -GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \ -/* class A needs to have dll-interface to be used by clients of class B */) +GTEST_DISABLE_MSC_WARNINGS_PUSH_( + 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 { @@ -5270,7 +5272,7 @@ PolymorphicMatcher<internal::variant_matcher::VariantMatcher<T> > VariantWith( } // 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. // We must include this header at the end to make sure it can use the |