merging

2018-04-10 16:22:50 -04:00
parent 25d8176e4f
commit 9bc82ce725
2 changed files with 9 additions and 6 deletions
--- 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