more

googletest/include/gtest/gtest.h

@@ -82,14 +82,15 @@
 
 namespace testing {
 
-// Silence C4100 (unreferenced formal parameter) for MSVC
+// Silence C4100 (unreferenced formal parameter) for MSVC 14 and 15
 #ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable:4100)
-# pragma warning(disable:4805)
+# if _MSC_VER <= 1900
+#  pragma warning(push)
+#  pragma warning(disable:4100)
+#  pragma warning(disable:4805)
+# endif
 #endif
 
-
 // Declares the flags.
 
 // This flag temporary enables the disabled tests.
@@ -2307,7 +2308,9 @@ bool StaticAssertTypeEq() {
 GTEST_API_ std::string TempDir();
 
 #ifdef _MSC_VER
-# pragma warning(pop)
+# if _MSC_VER <= 1900
+#  pragma warning(pop)
+# endif
 #endif
 
 }  // namespace testing