From 98e88ac02c0f33385049e4e52232022372062282 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Thu, 23 Apr 2026 06:14:48 -0500 Subject: [PATCH] [scheduler] Normalise to_remove_empty_/to_remove_count_ preprocessor form Use `#if defined(X)` / `#elif defined(Y)` / `#else` for the three-way ATOMICS / NO_ATOMICS / SINGLE split. Also fix the SINGLE-branch body indentation to match the other branches. --- esphome/core/scheduler.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esphome/core/scheduler.h b/esphome/core/scheduler.h index d5d1a0385c..aaa8f7fc5c 100644 --- a/esphome/core/scheduler.h +++ b/esphome/core/scheduler.h @@ -626,7 +626,7 @@ class Scheduler { // Lock-free check if there are items to remove (for fast-path in cleanup_) bool to_remove_empty_() const { -#ifdef ESPHOME_THREAD_MULTI_ATOMICS +#if defined(ESPHOME_THREAD_MULTI_ATOMICS) return this->to_remove_.load(std::memory_order_relaxed) == 0; #elif defined(ESPHOME_THREAD_MULTI_NO_ATOMICS) return __atomic_load_n(&this->to_remove_, __ATOMIC_RELAXED) == 0; @@ -660,7 +660,7 @@ class Scheduler { } uint32_t to_remove_count_() const { -#ifdef ESPHOME_THREAD_MULTI_ATOMICS +#if defined(ESPHOME_THREAD_MULTI_ATOMICS) return this->to_remove_.load(std::memory_order_relaxed); #elif defined(ESPHOME_THREAD_MULTI_NO_ATOMICS) return __atomic_load_n(&this->to_remove_, __ATOMIC_RELAXED);