yet more

7 years ago · f5871009e6
parent 05b5a53898
commit f5871009e6
2 changed files with 4 additions and 4 deletions
--- a/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump
+++ b/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump
@ -1,5 +1,5 @@
 $$ -*- mode: c++; -*-
-$$ This is a Pump source file (http://go/pump).  Please use Pump to convert
+$$ This is a Pump source file. Please use Pump to convert
 $$ it to callback-actions.h.
 $$
 $var max_callback_arity = 5
--- a/googletest/include/gtest/gtest.h
+++ b/googletest/include/gtest/gtest.h
@ -83,12 +83,12 @@
 namespace testing {

 // Silence C4100 (unreferenced formal parameter) and 4805
-// unsafe mix of bool and type int for MSVC 14 and 15
+// unsafe mix of type 'const int' and type 'const bool'
 #ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable:4805)
 # if _MSC_VER <= 1900
-#  pragma warning(push)
 #  pragma warning(disable:4100)
-#  pragma warning(disable:4805)
 # endif
 #endif