projects / platform / upstream / glog.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4f6088b)
Don't #undef GLOG_MSVC_*
author <shinichiro.hamaji@gmail.com> <>
Tue, 17 Jul 2012 10:51:15 +0000 (10:51 +0000)
committer <shinichiro.hamaji@gmail.com> <>
Tue, 17 Jul 2012 10:51:15 +0000 (10:51 +0000)
They are necessary because GLOG_MSVC_* will be expanded at DCHECK

git-svn-id: https://google-glog.googlecode.com/svn/trunk@115 eb4d4688-79bd-11dd-afb4-1d65580434c0

src/glog/logging.h.in patch | blob | history
src/windows/glog/logging.h patch | blob | history

diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in
index ca886b2f2c3243531c3f67e13bdfe78de682beb8..b0b3240e143b5302e76702a52d5e5b1e9627f491 100644 (file)
--- a/src/glog/logging.h.in
+++ b/src/glog/logging.h.in
@@ -1544,7 +1544,4 @@ GOOGLE_GLOG_DLL_DECL void InstallFailureWriter(
 
 @ac_google_end_namespace@
 
-#undef GLOG_MSVC_PUSH_DISABLE_WARNING
-#undef GLOG_MSVC_POP_WARNING
-
 #endif // _LOGGING_H_
diff --git a/src/windows/glog/logging.h b/src/windows/glog/logging.h
index cc15b1536e0cfd412a84131eea5e7711edb39396..1e01e26bdff7d959530a89fbf90bd72358c3946a 100755 (executable)
--- a/src/windows/glog/logging.h
+++ b/src/windows/glog/logging.h
@@ -1548,7 +1548,4 @@ GOOGLE_GLOG_DLL_DECL void InstallFailureWriter(
 
 }
 
-#undef GLOG_MSVC_PUSH_DISABLE_WARNING
-#undef GLOG_MSVC_POP_WARNING
-
 #endif // _LOGGING_H_
Domain: System / Base;