#253: Use MS preprocessor idiom to disable warning

2017-10-18 20:56:49 +02:00 · 2017-10-18 20:56:49 +02:00 · 4912af30f9
commit 4912af30f9
parent d0531421fd
1 changed files with 2 additions and 1 deletions
--- 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)