formatting

googlemock/src/gmock-spec-builders.cc

@@ -877,7 +877,7 @@ InSequence::~InSequence() {
 }  // namespace testing
 
 #ifdef _MSC_VER
-#if _MSC_VER == 1900
+#if _MSC_VER <= 1900
 #  pragma warning(pop)
 #endif
 #endif

googlemock/test/gmock-actions_test.cc

@@ -33,6 +33,8 @@
 //
 // This file tests the built-in actions.
 
+// 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)
@@ -1569,3 +1571,4 @@ TEST(MoveOnlyArgumentsTest, ReturningActions) {
 #  pragma warning(pop)
 #endif
 #endif
+

googlemock/test/gmock_output_test_.cc

@@ -39,7 +39,6 @@
 
 #include "gtest/gtest.h"
 
-
 // Silence C4100 (unreferenced formal parameter) for MSVC 14 and 15
 #ifdef _MSC_VER
 # if _MSC_VER <= 1900
@@ -48,7 +47,6 @@
 # endif
 #endif
 
-
 using testing::_;
 using testing::AnyNumber;
 using testing::Ge;

googletest/include/gtest/gtest.h

@@ -82,7 +82,8 @@
 
 namespace testing {
 
-// Silence C4100 (unreferenced formal parameter) for MSVC 14 and 15
+// Silence C4100 (unreferenced formal parameter) and 4805
+// unsafe mix of bool and type int for MSVC 14 and 15
 #ifdef _MSC_VER
 # if _MSC_VER <= 1900
 #  pragma warning(push)
@@ -91,6 +92,7 @@ namespace testing {
 # endif
 #endif
 
+
 // Declares the flags.
 
 // This flag temporary enables the disabled tests.