From 2cc008538c97189a5130a5598c62574c4972bef4 Mon Sep 17 00:00:00 2001 From: misterg Date: Tue, 28 Aug 2018 16:24:08 -0400 Subject: Googletest export Internal Change PiperOrigin-RevId: 210594341 --- googlemock/include/gmock/gmock-matchers.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'googlemock') 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 // 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 > 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 -- cgit v1.2.3 From a5cc7aa3fe233111adbb05aacf03569a72fd6c3d Mon Sep 17 00:00:00 2001 From: misterg Date: Thu, 30 Aug 2018 16:26:26 -0400 Subject: Googletest export Fix broken OSS windows build. PiperOrigin-RevId: 210969049 --- googlemock/include/gmock/gmock-matchers.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'googlemock') 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 // 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 > 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 -- cgit v1.2.3