From 8c0e0d5c17f9d7395bd0e0caaa8f4707561be2a2 Mon Sep 17 00:00:00 2001 From: Gennadiy Civil Date: Tue, 28 Aug 2018 23:25:51 -0400 Subject: [PATCH] MSVC warnings silence --- googletest/test/googletest-output-test_.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/googletest/test/googletest-output-test_.cc b/googletest/test/googletest-output-test_.cc index d6f7e0ba..cfae8818 100644 --- a/googletest/test/googletest-output-test_.cc +++ b/googletest/test/googletest-output-test_.cc @@ -39,6 +39,10 @@ #include +#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; @@ -1098,6 +1102,8 @@ 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() +#endif // . _MSC_VER return RunAllTests(); }