Skip to content

GitLab

You need to sign in or sign up before continuing.
Unverified Commit 9ad73983 authored by Gennadiy Civil's avatar Gennadiy Civil Committed by GitHub
Browse files

Update gmock-matchers.h

parent 1db4a426
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
googlemock/include/gmock/gmock-matchers.h
View file @ 9ad73983
...@@ -56,8 +56,9 @@ ...@@ -56,8 +56,9 @@
# include <initializer_list> // NOLINT -- must be after gtest.h # include <initializer_list> // NOLINT -- must be after gtest.h
#endif #endif
GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \ GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 5046 \
/* class A needs to have dll-interface to be used by clients of class B */) /* 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 { namespace testing {
...@@ -5270,7 +5271,7 @@ PolymorphicMatcher<internal::variant_matcher::VariantMatcher<T> > VariantWith( ...@@ -5270,7 +5271,7 @@ PolymorphicMatcher<internal::variant_matcher::VariantMatcher<T> > VariantWith(
} // namespace testing } // 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. // 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 // We must include this header at the end to make sure it can use the
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment