more mcvs fixing

2018-04-06 16:55:46 -04:00
parent 701e1e5dc1
commit dbd206e3d9
1 changed files with 12 additions and 0 deletions
--- a/googlemock/src/gmock-spec-builders.cc
+++ b/googlemock/src/gmock-spec-builders.cc
@@ -49,6 +49,14 @@
 # include <unistd.h>  // NOLINT
 #endif

+// Silence C4800 (C4800: 'int *const ': forcing value
+// to bool 'true' or 'false') for MSVC 14
+#ifdef _MSC_VER && _MSC_VER == 1900
+# pragma warning(push)
+# pragma warning(disable:4800)
+#endif
+
+
 namespace testing {
 namespace internal {

@@ -866,3 +874,7 @@ InSequence::~InSequence() {
 }

 }  // namespace testing
+
+#ifdef _MSC_VER && _MSC_VER == 1900
+# pragma warning(pop)
+#endif