googletest export

- 209457654 Import of OSS PR, https://github.com/google/googletest/pu... by misterg <misterg@google.com>

PiperOrigin-RevId: 209457654
This commit is contained in:
misterg
2018-08-20 14:48:45 -04:00
committed by Gennadiy Civil
parent 5891bb5307
commit df428ec118
11 changed files with 63 additions and 9 deletions

View File

@@ -56,6 +56,9 @@
# include <initializer_list> // 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 */)
namespace testing {
// To implement a matcher Foo for type T, define:
@@ -5266,6 +5269,8 @@ PolymorphicMatcher<internal::variant_matcher::VariantMatcher<T> > VariantWith(
} // namespace testing
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
// declarations from this file.