preproc syntax ( I can never remember it)

7 years ago · 35a709a701
parent 61e8a0b10b
commit 35a709a701
1 changed files with 9 additions and 5 deletions
--- a/googlemock/src/gmock-spec-builders.cc
+++ b/googlemock/src/gmock-spec-builders.cc
@ -51,9 +51,11 @@

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

 namespace testing {
@ -874,6 +876,8 @@ InSequence::~InSequence() {

 }  // namespace testing

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