diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-12 18:49:55 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-12 18:49:55 +0000 |
| commit | 07c19ac617bf16fc8559448fb43e696bcf43b2e9 (patch) | |
| tree | 30f2a78649e2bf97d57e1586d2e27fbf0e4731ff /base/mac/mac_logging.h | |
| parent | 353132b98a665e7f93b110c36888c4eef2002a9b (diff) | |
| download | chromium_src-07c19ac617bf16fc8559448fb43e696bcf43b2e9.zip chromium_src-07c19ac617bf16fc8559448fb43e696bcf43b2e9.tar.gz chromium_src-07c19ac617bf16fc8559448fb43e696bcf43b2e9.tar.bz2 | |
Use the new ScopedMachVM class and the MACH_LOG family of logging macros
where it makes sense to do so in existing code.
This migration shook out a couple of bugs in mach_logging.h carried over
from mac_logging.h (fixed there too).
R=rsesek@chromium.org, sky@chromium.org
Review URL: https://codereview.chromium.org/278923002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269829 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/mac/mac_logging.h')
| -rw-r--r-- | base/mac/mac_logging.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/base/mac/mac_logging.h b/base/mac/mac_logging.h index 02f205d..1081490 100644 --- a/base/mac/mac_logging.h +++ b/base/mac/mac_logging.h @@ -5,6 +5,8 @@ #ifndef BASE_MAC_MAC_LOGGING_H_ #define BASE_MAC_MAC_LOGGING_H_ +#include "base/base_export.h" +#include "base/basictypes.h" #include "base/logging.h" #include "build/build_config.h" @@ -43,6 +45,12 @@ class BASE_EXPORT OSStatusLogMessage : public logging::LogMessage { } // namespace logging +#if defined(NDEBUG) +#define MAC_DVLOG_IS_ON(verbose_level) 0 +#else +#define MAC_DVLOG_IS_ON(verbose_level) VLOG_IS_ON(verbose_level) +#endif + #define OSSTATUS_LOG_STREAM(severity, status) \ COMPACT_GOOGLE_LOG_EX_ ## severity(OSStatusLogMessage, status).stream() #define OSSTATUS_VLOG_STREAM(verbose_level, status) \ @@ -74,10 +82,10 @@ class BASE_EXPORT OSStatusLogMessage : public logging::LogMessage { #define OSSTATUS_DVLOG(verbose_level, status) \ LAZY_STREAM(OSSTATUS_VLOG_STREAM(verbose_level, status), \ - DVLOG_IS_ON(verbose_level)) + MAC_DVLOG_IS_ON(verbose_level)) #define OSSTATUS_DVLOG_IF(verbose_level, condition, status) \ - LAZY_STREAM(OSSTATUS_VLOG_STREAM(verbose_level, status) \ - DVLOG_IS_ON(verbose_level) && (condition)) + LAZY_STREAM(OSSTATUS_VLOG_STREAM(verbose_level, status), \ + MAC_DVLOG_IS_ON(verbose_level) && (condition)) #define OSSTATUS_DCHECK(condition, status) \ LAZY_STREAM(OSSTATUS_LOG_STREAM(FATAL, status), \ |