summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDariusz Ostolski <dariusz.ostolski@gmail.com>2017-10-18 18:56:49 (GMT)
committerDariusz Ostolski <dariusz.ostolski@gmail.com>2017-10-18 18:56:49 (GMT)
commit4912af30f98620729ea10dfd8feece475ba38c26 (patch)
treee3465cf7c8771d374067cc6217f2592d2140c78b /src
parentd0531421fd5437ae3e5249106c6fc4247996e526 (diff)
downloadglog-4912af30f98620729ea10dfd8feece475ba38c26.zip
glog-4912af30f98620729ea10dfd8feece475ba38c26.tar.gz
glog-4912af30f98620729ea10dfd8feece475ba38c26.tar.bz2
#253: Use MS preprocessor idiom to disable warning
Diffstat (limited to 'src')
-rw-r--r--src/glog/logging.h.in3
1 files changed, 2 insertions, 1 deletions
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)