And also silence for MSVS14

2018-04-09 10:51:15 -04:00 · 2018-04-09 10:51:15 -04:00 · 6525044ce2
commit 6525044ce2
parent 35a709a701
1 changed files with 2 additions and 2 deletions
--- a/googlemock/src/gmock-spec-builders.cc
+++ b/googlemock/src/gmock-spec-builders.cc
@ -50,9 +50,9 @@
 #endif

 // Silence C4800 (C4800: 'int *const ': forcing value
-// to bool 'true' or 'false') for MSVC 14
+// to bool 'true' or 'false') for MSVC 14,15
 #ifdef _MSC_VER
-#if _MSC_VER == 1900
+#if _MSC_VER <= 1900
 #  pragma warning(push)
 #  pragma warning(disable:4800)
 #endif