From 207865d4779a9c74c904eddf83d0ac64ddbe9058 Mon Sep 17 00:00:00 2001 From: "shinichiro.hamaji" Date: Tue, 17 Jul 2012 10:51:15 +0000 Subject: [PATCH] Don't #undef GLOG_MSVC_* They are necessary because GLOG_MSVC_* will be expanded at DCHECK --- src/glog/logging.h.in | 3 --- src/windows/glog/logging.h | 3 --- 2 files changed, 6 deletions(-) diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in index ca886b2..b0b3240 100644 --- 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 cc15b15..1e01e26 100755 --- 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_