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

Googletest export

Browse Source 
Internal Change

PiperOrigin-RevId: 210594341
This commit is contained in:
misterg
2018-08-28 16:24:08 -04:00
committed by Gennadiy Civil
parent b8e2562086
commit 2cc008538c
3 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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