From 4912af30f98620729ea10dfd8feece475ba38c26 Mon Sep 17 00:00:00 2001 From: Dariusz Ostolski Date: Wed, 18 Oct 2017 20:56:49 +0200 Subject: #253: Use MS preprocessor idiom to disable warning --- src/glog/logging.h.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in index 2d834ec..bf6d754 100644 --- 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) -- cgit v1.2.3