diff options
| author | misterg <misterg@google.com> | 2018-08-28 16:24:08 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-08-30 21:32:41 -0400 |
| commit | 2cc008538c97189a5130a5598c62574c4972bef4 (patch) | |
| tree | 2973a21775759af879e3200cd9a6aea4e1b5e1a1 /googlemock/include/gmock/gmock-matchers.h | |
| parent | b8e2562086ef326a4a88089f85b29ce7b6f9464b (diff) | |
| download | googletest-2cc008538c97189a5130a5598c62574c4972bef4.tar.gz googletest-2cc008538c97189a5130a5598c62574c4972bef4.tar.bz2 googletest-2cc008538c97189a5130a5598c62574c4972bef4.zip | |
Googletest export
Internal Change
PiperOrigin-RevId: 210594341
Diffstat (limited to 'googlemock/include/gmock/gmock-matchers.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index 9cd1a065..3975cd07 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -56,9 +56,8 @@ # include <initializer_list> // NOLINT -- must be after gtest.h #endif -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 */) +GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \ +/* class A needs to have dll-interface to be used by clients of class B */) namespace testing { @@ -5271,7 +5270,7 @@ PolymorphicMatcher<internal::variant_matcher::VariantMatcher<T> > VariantWith( } // namespace testing -GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251 5046 +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 |