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.

Sign up for GitHub

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

Jump to bottom

simplify DLOG macro definition in NDEBUG mode #830

Merged
merged 2 commits into from
Aug 6, 2022
Merged

simplify DLOG macro definition in NDEBUG mode #830

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
370ac0f
simplify DLOG macro definition in NDEBUG mode
Jun 6, 2022
82b2518
Apply suggestions from code review
lstaroth Aug 6, 2022
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
50 changes: 9 additions & 41 deletions src/glog/logging.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,12 +691,8 @@ class LogSink; // defined below
#define LOG_STRING(severity, outvec) \
LOG_TO_STRING_##severity(static_cast<std::vector<std::string>*>(outvec)).stream()

#define LOG_IF(severity, condition) \
static_cast<void>(0), \
!(condition) ? (void) 0 : @ac_google_namespace@::LogMessageVoidify() & LOG(severity)
#define SYSLOG_IF(severity, condition) \
static_cast<void>(0), \
!(condition) ? (void) 0 : @ac_google_namespace@::LogMessageVoidify() & SYSLOG(severity)
#define LOG_IF(severity, condition) if(condition) LOG(severity)
#define SYSLOG_IF(severity, condition) if(condition) SYSLOG(severity)

#define LOG_ASSERT(condition) \
LOG_IF(FATAL, !(condition)) << "Assert failed: " #condition
Expand Down Expand Up @@ -993,9 +989,7 @@ DECLARE_CHECK_STROP_IMPL(strcasecmp, false)
__FILE__, __LINE__, @ac_google_namespace@::GLOG_ ## severity, counter, \
&@ac_google_namespace@::LogMessage::SendToLog)

#define PLOG_IF(severity, condition) \
static_cast<void>(0), \
!(condition) ? (void) 0 : @ac_google_namespace@::LogMessageVoidify() & PLOG(severity)
#define PLOG_IF(severity, condition) if(condition) PLOG(severity)

// A CHECK() macro that postpends errno if the condition is false. E.g.
//
Expand Down Expand Up @@ -1327,30 +1321,17 @@ const LogSeverity GLOG_0 = GLOG_ERROR;

#else // !DCHECK_IS_ON()

#define DLOG(severity) \
static_cast<void>(0), \
true ? (void) 0 : @ac_google_namespace@::LogMessageVoidify() & LOG(severity)
#define DLOG(severity) if((false)) LOG(severity)

#define DVLOG(verboselevel) \
static_cast<void>(0), \
(true || !VLOG_IS_ON(verboselevel)) ? \
(void) 0 : @ac_google_namespace@::LogMessageVoidify() & LOG(INFO)
#define DVLOG(verboselevel) if((false) && VLOG_IS_ON(verboselevel)) LOG(INFO)

#define DLOG_IF(severity, condition) \
static_cast<void>(0), \
(true || !(condition)) ? (void) 0 : @ac_google_namespace@::LogMessageVoidify() & LOG(severity)
#define DLOG_IF(severity, condition) if((false) && (condition)) LOG(severity)

#define DLOG_EVERY_N(severity, n) \
static_cast<void>(0), \
true ? (void) 0 : @ac_google_namespace@::LogMessageVoidify() & LOG(severity)
#define DLOG_EVERY_N(severity, n) if((false)) LOG(severity)

#define DLOG_IF_EVERY_N(severity, condition, n) \
static_cast<void>(0), \
(true || !(condition))? (void) 0 : @ac_google_namespace@::LogMessageVoidify() & LOG(severity)
#define DLOG_IF_EVERY_N(severity, condition, n) if((false) && (condition)) LOG(severity)

#define DLOG_ASSERT(condition) \
static_cast<void>(0), \
true ? (void) 0 : LOG_ASSERT(condition)
#define DLOG_ASSERT(condition) if((false)) LOG_ASSERT(condition)

// MSVC warning C4127: conditional expression is constant
#define DCHECK(condition) \
Expand Down Expand Up @@ -1695,19 +1676,6 @@ class GLOG_EXPORT ErrnoLogMessage : public LogMessage {
};


// This class is used to explicitly ignore values in the conditional
// logging macros. This avoids compiler warnings like "value computed
// is not used" and "statement has no effect".

class GLOG_EXPORT LogMessageVoidify {
public:
LogMessageVoidify() { }
// This has to be an operator with a precedence lower than << but
// higher than ?:
void operator&(std::ostream&) { }
};


// Flushes all log files that contains messages that are at least of
// the specified severity level. Thread-safe.
GLOG_EXPORT void FlushLogFiles(LogSeverity min_severity);
Expand Down