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: yet more

---
 googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'googlemock/include/gmock/internal')

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
-- 
cgit v1.2.3


From ca54b673034f6f182ff22ac554efcd1176f5808c Mon Sep 17 00:00:00 2001
From: Gennadiy Civil <gennadiycivil@users.noreply.github.com>
Date: Mon, 9 Apr 2018 22:10:12 -0400
Subject: Revert "gmock actions 2"

---
 .../gmock/internal/custom/gmock-generated-actions.h.pump |  2 +-
 googlemock/include/gmock/internal/gmock-internal-utils.h | 16 +---------------
 2 files changed, 2 insertions(+), 16 deletions(-)

(limited to 'googlemock/include/gmock/internal')

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 03cfd8c5..d26c8a08 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. Please use Pump to convert
+$$ This is a Pump source file (http://go/pump).  Please use Pump to convert
 $$ it to callback-actions.h.
 $$
 $var max_callback_arity = 5
diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h
index 20c95c6a..37ceb549 100644
--- a/googlemock/include/gmock/internal/gmock-internal-utils.h
+++ b/googlemock/include/gmock/internal/gmock-internal-utils.h
@@ -48,14 +48,6 @@
 namespace testing {
 namespace internal {
 
-// Silence MSVC C4100 (unreferenced formal parameter) and
-// C4805('==': unsafe mix of type 'const int' and type 'const bool')
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable:4100)
-# pragma warning(disable:4805)
-#endif
-
 // Joins a vector of strings as if they are fields of a tuple; returns
 // the joined string.
 GTEST_API_ std::string JoinAsTuple(const Strings& fields);
@@ -518,7 +510,7 @@ struct BooleanConstant {};
 
 // Emit an assertion failure due to incorrect DoDefault() usage. Out-of-lined to
 // reduce code size.
-GTEST_API_ void IllegalDoDefault(const char* file, int line);
+void IllegalDoDefault(const char* file, int line);
 
 #if GTEST_LANG_CXX11
 // Helper types for Apply() below.
@@ -547,12 +539,6 @@ auto Apply(F&& f, Tuple&& args)
                    make_int_pack<std::tuple_size<Tuple>::value>());
 }
 #endif
-
-
-#ifdef _MSC_VER
-# pragma warning(pop)
-#endif
-
 }  // namespace internal
 }  // namespace testing
 
-- 
cgit v1.2.3