projects
/
platform
/
upstream
/
glog.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d053142
)
#253: Use MS preprocessor idiom to disable warning
author
Dariusz Ostolski
<dariusz.ostolski@gmail.com>
Wed, 18 Oct 2017 18:56:49 +0000
(20:56 +0200)
committer
Dariusz Ostolski
<dariusz.ostolski@gmail.com>
Wed, 18 Oct 2017 18:56:49 +0000
(20:56 +0200)
src/glog/logging.h.in
patch
|
blob
|
history
diff --git
a/src/glog/logging.h.in
b/src/glog/logging.h.in
index
2d834ec
..
bf6d754
100644
(file)
--- 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)