From 615d0b97125d966d5bf21197c5c8c6f6292e71d8 Mon Sep 17 00:00:00 2001 From: Ky Waegel Date: Tue, 27 Nov 2018 17:35:07 -0800 Subject: [PATCH] Use push/pop macro when supressing warning * Previous implementation did not correctly restore the warning state if initially disabled. --- src/windows/glog/logging.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/windows/glog/logging.h b/src/windows/glog/logging.h index 8d006751a..26e080b85 100755 --- a/src/windows/glog/logging.h +++ b/src/windows/glog/logging.h @@ -1155,13 +1155,9 @@ class GOOGLE_GLOG_DLL_DECL LogMessage { // 2005 if you are deriving from a type in the Standard C++ Library" // http://msdn.microsoft.com/en-us/library/3tdb471s(VS.80).aspx // Let's just ignore the warning. -#ifdef _MSC_VER -# pragma warning(disable: 4275) -#endif +GLOG_MSVC_PUSH_DISABLE_WARNING(4275) class GOOGLE_GLOG_DLL_DECL LogStream : public std::ostream { -#ifdef _MSC_VER -# pragma warning(default: 4275) -#endif +GLOG_MSVC_POP_WARNING() public: LogStream(char *buf, int len, int ctr) : std::ostream(NULL),