Unverified Commit 615d0b97 authored by Ky Waegel's avatar Ky Waegel Committed by GitHub

Use push/pop macro when supressing warning

* Previous implementation did not correctly restore the warning state if initially disabled.
parent 78109661
...@@ -1155,13 +1155,9 @@ public: ...@@ -1155,13 +1155,9 @@ public:
// 2005 if you are deriving from a type in the Standard C++ Library" // 2005 if you are deriving from a type in the Standard C++ Library"
// http://msdn.microsoft.com/en-us/library/3tdb471s(VS.80).aspx // http://msdn.microsoft.com/en-us/library/3tdb471s(VS.80).aspx
// Let's just ignore the warning. // Let's just ignore the warning.
#ifdef _MSC_VER GLOG_MSVC_PUSH_DISABLE_WARNING(4275)
# pragma warning(disable: 4275)
#endif
class GOOGLE_GLOG_DLL_DECL LogStream : public std::ostream { class GOOGLE_GLOG_DLL_DECL LogStream : public std::ostream {
#ifdef _MSC_VER GLOG_MSVC_POP_WARNING()
# pragma warning(default: 4275)
#endif
public: public:
LogStream(char *buf, int len, int ctr) LogStream(char *buf, int len, int ctr)
: std::ostream(NULL), : std::ostream(NULL),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment