From 431bfdcaf4a0f08c7ebd571291bf41d06195c20d Mon Sep 17 00:00:00 2001
From: Gennadiy Civil <misterg@google.com>
Date: Mon, 9 Apr 2018 11:48:02 -0400
Subject: msvc 14

---
 googlemock/src/gmock-all.cc | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'googlemock/src')

diff --git a/googlemock/src/gmock-all.cc b/googlemock/src/gmock-all.cc
index 7aebce7a..203bdb93 100644
--- a/googlemock/src/gmock-all.cc
+++ b/googlemock/src/gmock-all.cc
@@ -37,6 +37,16 @@
 
 // This line ensures that gmock.h can be compiled on its own, even
 // when it's fused.
+
+// 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
+
 #include "gmock/gmock.h"
 
 // The following lines pull in the real gmock *.cc files.
@@ -45,3 +55,9 @@
 #include "src/gmock-matchers.cc"
 #include "src/gmock-spec-builders.cc"
 #include "src/gmock.cc"
+
+#ifdef _MSC_VER
+#if _MSC_VER == 1900
+#  pragma warning(pop)
+#endif
+#endif
-- 
cgit v1.2.3