... and this

64d24b81 · Gennadiy Civil · c1d4c342 · 64d24b81
Commit 64d24b81 authored Apr 09, 2018 by Gennadiy Civil
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 8 deletions

googlemock/test/gmock_output_test_.cc googlemock/test/gmock_output_test_.cc +4 -8

No files found.
--- a/googlemock/test/gmock_output_test_.cc
+++ b/googlemock/test/gmock_output_test_.cc
@@ -39,12 +39,10 @@

 #include "gtest/gtest.h"

-// Silence C4100 (unreferenced formal parameter) for MSVC 14 and 15
+// Silence C4100 (unreferenced formal parameter)
 #ifdef _MSC_VER
-# if _MSC_VER <= 1900
-#  pragma warning(push)
-#  pragma warning(disable:4100)
-# endif
+# pragma warning(push)
+# pragma warning(disable:4100)
 #endif

 using testing::_;
@@ -308,7 +306,5 @@ int main(int argc, char **argv) {
 }

 #ifdef _MSC_VER
-# if _MSC_VER <= 1900
-#  pragma warning(pop)
-# endif
+# pragma warning(pop)
 #endif