aboutsummaryrefslogtreecommitdiffstats
path: root/googletest/test/gtest-typed-test_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'googletest/test/gtest-typed-test_test.cc')
-rw-r--r--googletest/test/gtest-typed-test_test.cc8
1 files changed, 0 insertions, 8 deletions
diff --git a/googletest/test/gtest-typed-test_test.cc b/googletest/test/gtest-typed-test_test.cc
index c38bb94a..e9eed639 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)