luo980/glog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: move LogMessageVoidify into internal namespace (#1053)

Browse Source
This commit is contained in:
Sergiu Deitsch 2024-01-09 13:46:26 +01:00 committed by GitHub
parent 941c66fbcb
commit dd77d0fd38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/glog/logging.h
View File

@ -558,10 +558,14 @@ class LogSink; // defined below
#define LOG_IF(severity, condition) \ #define LOG_IF(severity, condition) \
static_cast<void>(0), \ static_cast<void>(0), \
!(condition) ? (void)0 : google::LogMessageVoidify() & LOG(severity) !(condition) \
? (void)0 \
: google::logging::internal::LogMessageVoidify() & LOG(severity)
#define SYSLOG_IF(severity, condition) \ #define SYSLOG_IF(severity, condition) \
static_cast<void>(0), \ static_cast<void>(0), \
!(condition) ? (void)0 : google::LogMessageVoidify() & SYSLOG(severity) !(condition) \
? (void)0 \
: google::logging::internal::LogMessageVoidify() & SYSLOG(severity)
#define LOG_ASSERT(condition) \ #define LOG_ASSERT(condition) \
LOG_IF(FATAL, !(condition)) << "Assert failed: " #condition LOG_IF(FATAL, !(condition)) << "Assert failed: " #condition
@ -853,7 +857,9 @@ DECLARE_CHECK_STROP_IMPL(strcasecmp, false)
#define PLOG_IF(severity, condition) \ #define PLOG_IF(severity, condition) \
static_cast<void>(0), \ static_cast<void>(0), \
!(condition) ? (void)0 : google::LogMessageVoidify() & PLOG(severity) !(condition) \
? (void)0 \
: google::logging::internal::LogMessageVoidify() & PLOG(severity)
// A CHECK() macro that postpends errno if the condition is false. E.g. // A CHECK() macro that postpends errno if the condition is false. E.g.
// //
@ -1052,34 +1058,41 @@ constexpr LogSeverity GLOG_0 = GLOG_ERROR;
# define DLOG(severity) \ # define DLOG(severity) \
static_cast<void>(0), \ static_cast<void>(0), \
true ? (void)0 : google::LogMessageVoidify() & LOG(severity) true ? (void)0 \
: google::logging::internal::LogMessageVoidify() & LOG(severity)
# define DVLOG(verboselevel) \ # define DVLOG(verboselevel) \
static_cast<void>(0), (true || !VLOG_IS_ON(verboselevel)) \ static_cast<void>(0), \
? (void)0 \ (true || !VLOG_IS_ON(verboselevel)) \
: google::LogMessageVoidify() & LOG(INFO) ? (void)0 \
: google::logging::internal::LogMessageVoidify() & LOG(INFO)
# define DLOG_IF(severity, condition) \ # define DLOG_IF(severity, condition) \
static_cast<void>(0), (true || !(condition)) \ static_cast<void>(0), \
? (void)0 \ (true || !(condition)) \
: google::LogMessageVoidify() & LOG(severity) ? (void)0 \
: google::logging::internal::LogMessageVoidify() & LOG(severity)
# define DLOG_EVERY_N(severity, n) \ # define DLOG_EVERY_N(severity, n) \
static_cast<void>(0), \ static_cast<void>(0), \
true ? (void)0 : google::LogMessageVoidify() & LOG(severity) true ? (void)0 \
: google::logging::internal::LogMessageVoidify() & LOG(severity)
# define DLOG_IF_EVERY_N(severity, condition, n) \ # define DLOG_IF_EVERY_N(severity, condition, n) \
static_cast<void>(0), (true || !(condition)) \ static_cast<void>(0), \
? (void)0 \ (true || !(condition)) \
: google::LogMessageVoidify() & LOG(severity) ? (void)0 \
: google::logging::internal::LogMessageVoidify() & LOG(severity)
# define DLOG_FIRST_N(severity, n) \ # define DLOG_FIRST_N(severity, n) \
static_cast<void>(0), \ static_cast<void>(0), \
true ? (void)0 : google::LogMessageVoidify() & LOG(severity) true ? (void)0 \
: google::logging::internal::LogMessageVoidify() & LOG(severity)
# define DLOG_EVERY_T(severity, T) \ # define DLOG_EVERY_T(severity, T) \
static_cast<void>(0), \ static_cast<void>(0), \
true ? (void)0 : google::LogMessageVoidify() & LOG(severity) true ? (void)0 \
: google::logging::internal::LogMessageVoidify() & LOG(severity)
# define DLOG_ASSERT(condition) \ # define DLOG_ASSERT(condition) \
static_cast<void>(0), true ? (void)0 : (LOG_ASSERT(condition)) static_cast<void>(0), true ? (void)0 : (LOG_ASSERT(condition))
@ -1414,13 +1427,17 @@ class GLOG_EXPORT ErrnoLogMessage : public LogMessage {
// logging macros. This avoids compiler warnings like "value computed // logging macros. This avoids compiler warnings like "value computed
// is not used" and "statement has no effect". // is not used" and "statement has no effect".
class GLOG_EXPORT LogMessageVoidify { namespace logging {
namespace internal {
class LogMessageVoidify {
public: public:
LogMessageVoidify() {} LogMessageVoidify() {}
// This has to be an operator with a precedence lower than << but // This has to be an operator with a precedence lower than << but
// higher than ?: // higher than ?:
void operator&(std::ostream&) {} void operator&(std::ostream&) {}
}; };
} // namespace internal
} // namespace logging
// Flushes all log files that contains messages that are at least of // Flushes all log files that contains messages that are at least of
// the specified severity level. Thread-safe. // the specified severity level. Thread-safe.