Skip to content

Commit 266b1a0

Browse files
suertreuscopybara-github
suertreus
authored and
copybara-github
committed
Cast ABSL_MIN_LOG_LEVEL to absl::LogSeverityAtLeast instead of absl::LogSeverity.
PiperOrigin-RevId: 804953870 Change-Id: I1cf4abd1e13c9644eb6e46a22d9d8c642c420d1d
1 parent 26c9126 commit 266b1a0

File tree

3 files changed

+44
-41
lines changed

3 files changed

+44
-41
lines changed

‎absl/base/internal/raw_logging.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ void RawLogVA(absl::LogSeverity severity, const char* file, int line,
157157
#endif
158158

159159
#ifdef ABSL_MIN_LOG_LEVEL
160-
if (severity < static_cast<absl::LogSeverity>(ABSL_MIN_LOG_LEVEL) &&
160+
if (severity < static_cast<absl::LogSeverityAtLeast>(ABSL_MIN_LOG_LEVEL) &&
161161
severity < absl::LogSeverity::kFatal) {
162162
enabled = false;
163163
}

‎absl/log/internal/check_op.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@
4646
// `ABSL_LOG_INTERNAL_STRIP_STRING_LITERAL` wraps string literals that
4747
// should be stripped when `ABSL_MIN_LOG_LEVEL` exceeds `kFatal`.
4848
#ifdef ABSL_MIN_LOG_LEVEL
49-
#define ABSL_LOG_INTERNAL_STRIP_STRING_LITERAL(literal) \
50-
(::absl::LogSeverity::kFatal >= \
51-
static_cast<::absl::LogSeverity>(ABSL_MIN_LOG_LEVEL) \
52-
? (literal) \
49+
#define ABSL_LOG_INTERNAL_STRIP_STRING_LITERAL(literal) \
50+
(::absl::LogSeverity::kFatal >= \
51+
static_cast<::absl::LogSeverityAtLeast>(ABSL_MIN_LOG_LEVEL) \
52+
? (literal) \
5353
: "")
5454
#else
5555
#define ABSL_LOG_INTERNAL_STRIP_STRING_LITERAL(literal) (literal)
@@ -435,7 +435,7 @@ ABSL_LOG_INTERNAL_DEFINE_MAKE_CHECK_OP_STRING_EXTERN(const void* absl_nonnull);
435435
#ifdef ABSL_MIN_LOG_LEVEL
436436
#define ABSL_LOG_INTERNAL_CHECK_OP_IMPL_RESULT(U1, U2, v1, v2, exprtext) \
437437
((::absl::LogSeverity::kFatal >= \
438-
static_cast<::absl::LogSeverity>(ABSL_MIN_LOG_LEVEL)) \
438+
static_cast<::absl::LogSeverityAtLeast>(ABSL_MIN_LOG_LEVEL)) \
439439
? MakeCheckOpString<U1, U2>(v1, v2, exprtext) \
440440
: "")
441441
#else

‎absl/log/internal/conditions.h‎

Lines changed: 38 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -108,46 +108,49 @@
108108
#ifdef ABSL_MIN_LOG_LEVEL
109109
#define ABSL_LOG_INTERNAL_CONDITION_INFO(type, condition) \
110110
ABSL_LOG_INTERNAL_##type##_CONDITION( \
111-
(condition) && ::absl::LogSeverity::kInfo >= \
112-
static_cast<::absl::LogSeverity>(ABSL_MIN_LOG_LEVEL))
111+
(condition) && \
112+
::absl::LogSeverity::kInfo >= \
113+
static_cast<::absl::LogSeverityAtLeast>(ABSL_MIN_LOG_LEVEL))
113114
#define ABSL_LOG_INTERNAL_CONDITION_WARNING(type, condition) \
114115
ABSL_LOG_INTERNAL_##type##_CONDITION( \
115-
(condition) && ::absl::LogSeverity::kWarning >= \
116-
static_cast<::absl::LogSeverity>(ABSL_MIN_LOG_LEVEL))
116+
(condition) && \
117+
::absl::LogSeverity::kWarning >= \
118+
static_cast<::absl::LogSeverityAtLeast>(ABSL_MIN_LOG_LEVEL))
117119
#define ABSL_LOG_INTERNAL_CONDITION_ERROR(type, condition) \
118120
ABSL_LOG_INTERNAL_##type##_CONDITION( \
119-
(condition) && ::absl::LogSeverity::kError >= \
120-
static_cast<::absl::LogSeverity>(ABSL_MIN_LOG_LEVEL))
121+
(condition) && \
122+
::absl::LogSeverity::kError >= \
123+
static_cast<::absl::LogSeverityAtLeast>(ABSL_MIN_LOG_LEVEL))
121124
#define ABSL_LOG_INTERNAL_CONDITION_DO_NOT_SUBMIT(type, condition) \
122125
ABSL_LOG_INTERNAL_CONDITION_ERROR(type, condition)
123126
// NOTE: Use ternary operators instead of short-circuiting to mitigate
124127
// https://bugs.llvm.org/show_bug.cgi?id=51928.
125128
#define ABSL_LOG_INTERNAL_CONDITION_FATAL(type, condition) \
126129
ABSL_LOG_INTERNAL_##type##_CONDITION( \
127-
((condition) \
128-
? (::absl::LogSeverity::kFatal >= \
129-
static_cast<::absl::LogSeverity>(ABSL_MIN_LOG_LEVEL) \
130-
? true \
131-
: (::absl::log_internal::AbortQuietly(), false)) \
132-
: false))
130+
((condition) ? (::absl::LogSeverity::kFatal >= \
131+
static_cast<::absl::LogSeverityAtLeast>( \
132+
ABSL_MIN_LOG_LEVEL) \
133+
? true \
134+
: (::absl::log_internal::AbortQuietly(), false)) \
135+
: false))
133136
// NOTE: Use ternary operators instead of short-circuiting to mitigate
134137
// https://bugs.llvm.org/show_bug.cgi?id=51928.
135-
#define ABSL_LOG_INTERNAL_CONDITION_QFATAL(type, condition) \
136-
ABSL_LOG_INTERNAL_##type##_CONDITION( \
137-
((condition) \
138-
? (::absl::LogSeverity::kFatal >= \
139-
static_cast<::absl::LogSeverity>(ABSL_MIN_LOG_LEVEL) \
140-
? true \
141-
: (::absl::log_internal::ExitQuietly(), false)) \
142-
: false))
143-
#define ABSL_LOG_INTERNAL_CONDITION_DFATAL(type, condition) \
144-
ABSL_LOG_INTERNAL_##type##_CONDITION( \
145-
(ABSL_ASSUME(absl::kLogDebugFatal == absl::LogSeverity::kError || \
146-
absl::kLogDebugFatal == absl::LogSeverity::kFatal), \
147-
(condition) && \
148-
(::absl::kLogDebugFatal >= \
149-
static_cast<::absl::LogSeverity>(ABSL_MIN_LOG_LEVEL) || \
150-
(::absl::kLogDebugFatal == ::absl::LogSeverity::kFatal && \
138+
#define ABSL_LOG_INTERNAL_CONDITION_QFATAL(type, condition) \
139+
ABSL_LOG_INTERNAL_##type##_CONDITION( \
140+
((condition) ? (::absl::LogSeverity::kFatal >= \
141+
static_cast<::absl::LogSeverityAtLeast>( \
142+
ABSL_MIN_LOG_LEVEL) \
143+
? true \
144+
: (::absl::log_internal::ExitQuietly(), false)) \
145+
: false))
146+
#define ABSL_LOG_INTERNAL_CONDITION_DFATAL(type, condition) \
147+
ABSL_LOG_INTERNAL_##type##_CONDITION( \
148+
(ABSL_ASSUME(absl::kLogDebugFatal == absl::LogSeverity::kError || \
149+
absl::kLogDebugFatal == absl::LogSeverity::kFatal), \
150+
(condition) && \
151+
(::absl::kLogDebugFatal >= \
152+
static_cast<::absl::LogSeverityAtLeast>(ABSL_MIN_LOG_LEVEL) || \
153+
(::absl::kLogDebugFatal == ::absl::LogSeverity::kFatal && \
151154
(::absl::log_internal::AbortQuietly(), false)))))
152155

153156
#define ABSL_LOG_INTERNAL_CONDITION_LEVEL(severity) \
@@ -157,13 +160,13 @@
157160
::absl::NormalizeLogSeverity(severity); \
158161
absl_log_internal_severity_loop; absl_log_internal_severity_loop = 0) \
159162
ABSL_LOG_INTERNAL_CONDITION_LEVEL_IMPL
160-
#define ABSL_LOG_INTERNAL_CONDITION_LEVEL_IMPL(type, condition) \
161-
ABSL_LOG_INTERNAL_##type##_CONDITION(( \
162-
(condition) && \
163-
(absl_log_internal_severity >= \
164-
static_cast<::absl::LogSeverity>(ABSL_MIN_LOG_LEVEL) || \
165-
(absl_log_internal_severity == ::absl::LogSeverity::kFatal && \
166-
(::absl::log_internal::AbortQuietly(), false)))))
163+
#define ABSL_LOG_INTERNAL_CONDITION_LEVEL_IMPL(type, condition) \
164+
ABSL_LOG_INTERNAL_##type##_CONDITION( \
165+
((condition) && \
166+
(absl_log_internal_severity >= \
167+
static_cast<::absl::LogSeverityAtLeast>(ABSL_MIN_LOG_LEVEL) || \
168+
(absl_log_internal_severity == ::absl::LogSeverity::kFatal && \
169+
(::absl::log_internal::AbortQuietly(), false)))))
167170
#else // ndef ABSL_MIN_LOG_LEVEL
168171
#define ABSL_LOG_INTERNAL_CONDITION_INFO(type, condition) \
169172
ABSL_LOG_INTERNAL_##type##_CONDITION(condition)

0 commit comments

Comments
 (0)