Merge pull request google#254 from DariuszOstolski/issue253

google#253: Use MS preprocessor idiom to disable warning
durswd · Oct 20, 2017 · 906d956 · 906d956
2 parents 47a3fb0 + 8738325
commit 906d956
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in
@@ -1148,11 +1148,12 @@ public:
   // http://msdn.microsoft.com/en-us/library/3tdb471s(VS.80).aspx
   // Let's just ignore the warning.
 #ifdef _MSC_VER
+# pragma warning(push)
 # pragma warning(disable: 4275)
 #endif
   class GOOGLE_GLOG_DLL_DECL LogStream : public std::ostream {
 #ifdef _MSC_VER
-# pragma warning(default: 4275)
+# pragma warning(pop)
 #endif
   public:
     LogStream(char *buf, int len, int ctr)