From 9bc82ce7251b01ac3abfb28efc9793b56fa835d6 Mon Sep 17 00:00:00 2001
From: Gennadiy Civil <misterg@google.com>
Date: Tue, 10 Apr 2018 16:22:50 -0400
Subject: merging

---
 googlemock/test/gmock_output_test_.cc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'googlemock/test/gmock_output_test_.cc')

diff --git a/googlemock/test/gmock_output_test_.cc b/googlemock/test/gmock_output_test_.cc
index 59ea51bd..1b59eb3f 100644
--- a/googlemock/test/gmock_output_test_.cc
+++ b/googlemock/test/gmock_output_test_.cc
@@ -39,14 +39,12 @@
 
 #include "gtest/gtest.h"
 
-
-// Silence C4100 (unreferenced formal parameter) for MSVC
+// Silence C4100 (unreferenced formal parameter)
 #ifdef _MSC_VER
 # pragma warning(push)
 # pragma warning(disable:4100)
 #endif
 
-
 using testing::_;
 using testing::AnyNumber;
 using testing::Ge;
@@ -306,3 +304,7 @@ int main(int argc, char **argv) {
   TestCatchesLeakedMocksInAdHocTests();
   return RUN_ALL_TESTS();
 }
+
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
-- 
cgit v1.2.3