Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add LOG_TO_SINK_IF and DLOG_TO_SINK #1117

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/glog/logging.h
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,12 @@ class LogSink; // defined below
? (void)0 \
: google::logging::internal::LogMessageVoidify() & SYSLOG(severity)

#define LOG_TO_SINK_IF(sink, severity, condition) \
static_cast<void>(0), \
!(condition) \
? (void)0 \
: google::logging::internal::LogMessageVoidify() & LOG_TO_SINK(sink, severity)

#define LOG_ASSERT(condition) \
LOG_IF(FATAL, !(condition)) << "Assert failed: " #condition
#define SYSLOG_ASSERT(condition) \
Expand Down Expand Up @@ -1019,6 +1025,7 @@ constexpr LogSeverity GLOG_0 = GLOG_ERROR;
# define DLOG_FIRST_N(severity, n) LOG_FIRST_N(severity, n)
# define DLOG_EVERY_T(severity, T) LOG_EVERY_T(severity, T)
# define DLOG_ASSERT(condition) LOG_ASSERT(condition)
# define DLOG_TO_SINK(sink, severity) LOG_TO_SINK(sink, severity)

// debug-only checking. executed if DCHECK_IS_ON().
# define DCHECK(condition) CHECK(condition)
Expand Down Expand Up @@ -1077,6 +1084,11 @@ constexpr LogSeverity GLOG_0 = GLOG_ERROR;
# define DLOG_ASSERT(condition) \
static_cast<void>(0), true ? (void)0 : (LOG_ASSERT(condition))

# define DLOG_TO_SINK(sink, severity) \
static_cast<void>(0), \
true ? (void)0 \
: google::logging::internal::LogMessageVoidify() & LOG(severity)

// MSVC warning C4127: conditional expression is constant
# define DCHECK(condition) \
GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \
Expand Down