From bcd35523cd7cc376927173ce5621b544c122bacb Mon Sep 17 00:00:00 2001
From: David Benjamin <davidben@google.com>
Date: Sat, 6 May 2017 10:22:12 -0400
Subject: [PATCH] Avoid warning C4619 in MSVC 2017.

C4800 has since been removed in MSVC 2017, so trying to silence it
throws warning C4619 when enabled.
---
 googletest/include/gtest/gtest.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h
index a19625f3..2ad5a0cb 100644
--- 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) {