From c4e3d77ddc155a32e9f98f64ea1e111a5cce0e43 Mon Sep 17 00:00:00 2001
From: Gennadiy Civil <misterg@google.com>
Date: Mon, 9 Apr 2018 11:22:11 -0400
Subject: [PATCH] More msvc 14
---
googlemock/test/gmock-actions_test.cc | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/googlemock/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc
index ea6129d7..f8b9a1ef 100644
--- a/googlemock/test/gmock-actions_test.cc
+++ b/googlemock/test/gmock-actions_test.cc
@@ -43,6 +43,16 @@
#include "gtest/gtest.h"
#include "gtest/gtest-spi.h"
+// Silence C4800 (C4800: 'int *const ': forcing value
+// to bool 'true' or 'false') for MSVC 14,15
+#ifdef _MSC_VER
+#if _MSC_VER <= 1900
+# pragma warning(push)
+# pragma warning(disable:4800)
+#endif
+#endif
+
+
namespace {
// This list should be kept sorted.
@@ -1556,3 +1566,9 @@ TEST(MoveOnlyArgumentsTest, ReturningActions) {
#endif // GTEST_LANG_CXX11
} // Unnamed namespace
+
+#ifdef _MSC_VER
+#if _MSC_VER == 1900
+# pragma warning(pop)
+#endif
+#endif