diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-20 16:15:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-20 16:15:04 -0400 |
| commit | a6e7ba27c73726169811f3ae157951d946179499 (patch) | |
| tree | da0d99ab08f13a66da37b66c5f07bbd603ad72bc /googlemock/include/gmock/gmock-matchers.h | |
| parent | 21e518557ad7634bc4b1fd57effa7e49a1405bb5 (diff) | |
| parent | 735bd75f69f8a1c6240c95915edfa091bfa976ac (diff) | |
| download | googletest-a6e7ba27c73726169811f3ae157951d946179499.tar.gz googletest-a6e7ba27c73726169811f3ae157951d946179499.tar.bz2 googletest-a6e7ba27c73726169811f3ae157951d946179499.zip | |
Merge branch 'master' into josh/fix_scoped_class2
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. |