From f5871009e6d8db73c0516efeb2955436b7134fb4 Mon Sep 17 00:00:00 2001
From: Gennadiy Civil <misterg@google.com>
Date: Mon, 9 Apr 2018 16:04:48 -0400
Subject: [PATCH] yet more

---
 .../gmock/internal/custom/gmock-generated-actions.h.pump    | 2 +-
 googletest/include/gtest/gtest.h                            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump b/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump
index d26c8a08..03cfd8c5 100644
--- 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
diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h
index c5d1b7c8..efa98d51 100644
--- 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