summaryrefslogtreecommitdiffstats
path: root/googletest/test
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2018-08-28 23:55:17 -0400
committerGitHub <noreply@github.com>2018-08-28 23:55:17 -0400
commite103fa4f2a472a4bc217531ec075aabf56a785b9 (patch)
tree887fb95cb5bc64d9cf66d509e6e10cf23d8b9be4 /googletest/test
parent9b2016a01d19709b2ea94b5cc880b830e4d537ef (diff)
downloadgoogletest-e103fa4f2a472a4bc217531ec075aabf56a785b9.tar.gz
googletest-e103fa4f2a472a4bc217531ec075aabf56a785b9.zip
Disable MCVS warnings
Diffstat (limited to 'googletest/test')
-rw-r--r--googletest/test/gtest-typed-test_test.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/googletest/test/gtest-typed-test_test.cc b/googletest/test/gtest-typed-test_test.cc
index e9eed639..c38bb94a 100644
--- a/googletest/test/gtest-typed-test_test.cc
+++ b/googletest/test/gtest-typed-test_test.cc
@@ -35,6 +35,10 @@
#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
@@ -450,4 +454,8 @@ 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)
OpenPOWER on IntegriCloud