Skip to content

Commit

Permalink
Merge pull request google#420 from kwaegel/patch-1
Browse files Browse the repository at this point in the history
Use push/pop macro when supressing warning
  • Loading branch information
sergiud authored Jan 23, 2019
2 parents 1447646 + 746f91c commit 90a1742
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions src/glog/logging.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -1147,14 +1147,9 @@ public:
// 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(push)
# 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(pop)
#endif
GLOG_MSVC_POP_WARNING()
public:
LogStream(char *buf, int len, int ctr)
: std::ostream(NULL),
Expand Down

0 comments on commit 90a1742

Please sign in to comment.