diff options
| author | misterg <misterg@google.com> | 2018-08-28 20:24:08 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-08-31 01:32:41 (GMT) |
| commit | 2cc008538c97189a5130a5598c62574c4972bef4 (patch) | |
| tree | 2973a21775759af879e3200cd9a6aea4e1b5e1a1 | |
| parent | b8e2562086ef326a4a88089f85b29ce7b6f9464b (diff) | |
| download | googletest-2cc008538c97189a5130a5598c62574c4972bef4.zip googletest-2cc008538c97189a5130a5598c62574c4972bef4.tar.gz googletest-2cc008538c97189a5130a5598c62574c4972bef4.tar.bz2 | |
Googletest export
Internal Change
PiperOrigin-RevId: 210594341
| -rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 7 | ||||
| -rw-r--r-- | googletest/test/googletest-output-test_.cc | 8 | ||||
| -rw-r--r-- | googletest/test/gtest-typed-test_test.cc | 8 |
3 files changed, 4 insertions, 19 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index 9cd1a06..3975cd0 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -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 diff --git a/googletest/test/googletest-output-test_.cc b/googletest/test/googletest-output-test_.cc index 180630e..d6f7e0b 100644 --- a/googletest/test/googletest-output-test_.cc +++ b/googletest/test/googletest-output-test_.cc @@ -39,10 +39,6 @@ #include <stdlib.h> -#if _MSC_VER - GTEST_DISABLE_MSC_WARNINGS_PUSH_(4127 /* conditional expression is constant */) -#endif // . _MSC_VER - #if GTEST_IS_THREADSAFE using testing::ScopedFakeTestPartResultReporter; using testing::TestPartResultArray; @@ -1102,8 +1098,6 @@ int main(int argc, char **argv) { // are registered, and torn down in the reverse order. testing::AddGlobalTestEnvironment(new FooEnvironment); testing::AddGlobalTestEnvironment(new BarEnvironment); -#if _MSC_VER - GTEST_DISABLE_MSC_WARNINGS_POP_() // 4127 -#endif // . _MSC_VER + return RunAllTests(); } diff --git a/googletest/test/gtest-typed-test_test.cc b/googletest/test/gtest-typed-test_test.cc index c38bb94..e9eed63 100644 --- a/googletest/test/gtest-typed-test_test.cc +++ b/googletest/test/gtest-typed-test_test.cc @@ -35,10 +35,6 @@ #include "gtest/gtest.h" -#if _MSC_VER -GTEST_DISABLE_MSC_WARNINGS_PUSH_(4127 /* conditional expression is constant */) -#endif // _MSC_VER - using testing::Test; // Used for testing that SetUpTestCase()/TearDownTestCase(), fixture @@ -454,8 +450,4 @@ INSTANTIATE_TYPED_TEST_CASE_P(My, TrimmedTest, TrimTypes); // must be defined). This dummy test keeps gtest_main linked in. TEST(DummyTest, TypedTestsAreNotSupportedOnThisPlatform) {} -#if _MSC_VER -GTEST_DISABLE_MSC_WARNINGS_POP_() // 4127 -#endif // _MSC_VER - #endif // #if !defined(GTEST_HAS_TYPED_TEST) && !defined(GTEST_HAS_TYPED_TEST_P) |