Avoid warning C4619 in MSVC 2017.

C4800 has since been removed in MSVC 2017, so trying to silence it throws warning C4619 when enabled.

Avoid warning C4619 in MSVC 2017.
bcd35523 · David Benjamin · 5490beb0 · bcd35523
Commit bcd35523 authored May 06, 2017 by David Benjamin
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

gtest.h googletest/include/gtest/gtest.h +4 -0

No files found.
--- a/googletest/include/gtest/gtest.h
+++ b/googletest/include/gtest/gtest.h
@@ -259,7 +259,9 @@ class GTEST_API_ AssertionResult {
  // Used in EXPECT_TRUE/FALSE(assertion_result).
  AssertionResult(const AssertionResult& other);

+#if defined(_MSC_VER) && _MSC_VER < 1910
  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800 /* forcing value to bool */)
+#endif

  // Used in the EXPECT_TRUE/FALSE(bool_expression).
  //
@@ -276,7 +278,9 @@ class GTEST_API_ AssertionResult {
          /*enabler*/ = NULL)
      : success_(success) {}

+#if defined(_MSC_VER) && _MSC_VER < 1910
  GTEST_DISABLE_MSC_WARNINGS_POP_()
+#endif

  // Assignment operator.
  AssertionResult& operator=(AssertionResult other) {