gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Googletest export

Browse Source 
Fix broken OSS windows build.

PiperOrigin-RevId: 210969049
This commit is contained in:
misterg
2018-08-30 16:26:26 -04:00
committed by Gennadiy Civil
parent 41b539941f
commit a5cc7aa3fe
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
googlemock/include/gmock/gmock-matchers.h
View File

@@ -56,8 +56,10 @@
# 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_(
/* class A needs to have dll-interface to be used by clients of class B */) 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 { namespace testing {
@@ -5270,7 +5272,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