diff options
| author | misterg <misterg@google.com> | 2018-08-20 14:48:45 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-08-20 14:50:48 -0400 |
| commit | df428ec11891f12c81e2872c0432e342b5403a34 (patch) | |
| tree | 0a7df31c55911123ae017b89b39aca38dec3d939 /googlemock/include/gmock/gmock-matchers.h | |
| parent | 5891bb530736c39568f61ba0bf1a45d60d40f76e (diff) | |
| download | googletest-df428ec11891f12c81e2872c0432e342b5403a34.tar.gz googletest-df428ec11891f12c81e2872c0432e342b5403a34.tar.bz2 googletest-df428ec11891f12c81e2872c0432e342b5403a34.zip | |
googletest export
- 209457654 Import of OSS PR, https://github.com/google/googletest/pu... by misterg <misterg@google.com>
PiperOrigin-RevId: 209457654
Diffstat (limited to 'googlemock/include/gmock/gmock-matchers.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index a0018505..3336eff2 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -56,6 +56,9 @@ # 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 */) + namespace testing { // To implement a matcher Foo for type T, define: @@ -5266,6 +5269,8 @@ PolymorphicMatcher<internal::variant_matcher::VariantMatcher<T> > VariantWith( } // namespace testing +GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251 + // 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 // declarations from this file. |