From 9ad739833e16daa0f2909da7daee19a9dd608f29 Mon Sep 17 00:00:00 2001 From: Gennadiy Civil Date: Wed, 29 Aug 2018 22:32:08 -0400 Subject: [PATCH] Update gmock-matchers.h --- googlemock/include/gmock/gmock-matchers.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index 3975cd07..9cd1a065 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -56,8 +56,9 @@ # 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 +5271,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