Commit 2786ef41 authored by Michał Kępień's avatar Michał Kępień

Merge branch '1742-work-around-an-msvc-bug' into 'master'

Work around an MSVC bug

Closes #1742

See merge request !3347
parents 43e11807 4c4f5ccc
Pipeline #38677 passed with stages
in 3 minutes and 20 seconds
......@@ -1454,13 +1454,15 @@ isc_log_wouldlog(isc_log_t *lctx, int level) {
return (false);
}
if (level <= atomic_load_acquire(&lctx->highest_level)) {
int highest_level = atomic_load_acquire(&lctx->highest_level);
if (level <= highest_level) {
return (true);
}
if (atomic_load_acquire(&lctx->dynamic) &&
level <= atomic_load_acquire(&lctx->debug_level))
{
return (true);
if (atomic_load_acquire(&lctx->dynamic)) {
int debug_level = atomic_load_acquire(&lctx->debug_level);
if (level <= debug_level) {
return (true);
}
}
return (false);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment