MSVC warnings silence

8c0e0d5c · Gennadiy Civil · GitHub · 9d9d7a6a · 8c0e0d5c
Unverified Commit 8c0e0d5c authored Aug 28, 2018 by Gennadiy Civil Committed by GitHub Aug 28, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

googletest/test/googletest-output-test_.cc googletest/test/googletest-output-test_.cc +7 -1

No files found.
--- a/googletest/test/googletest-output-test_.cc
+++ b/googletest/test/googletest-output-test_.cc
@@ -39,6 +39,10 @@

 #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;
@@ -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();
 }