From bce8e6ecb6060ae3c35e19370f6bfebe8793fa27 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Thu, 2 Apr 2026 13:41:18 -1000
Subject: [PATCH] Fix clang-tidy: add braces, use uint32_t instead of unsigned
 long

---
 esphome/core/finite_set_mask.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/esphome/core/finite_set_mask.h b/esphome/core/finite_set_mask.h
index 02135c49dc..a84ca17b40 100644
--- a/esphome/core/finite_set_mask.h
+++ b/esphome/core/finite_set_mask.h
@@ -160,10 +160,11 @@ template<typename ValueType, typename BitPolicy = DefaultBitPolicy<ValueType, 16
     if (mask == 0)
       return BitPolicy::MAX_BITS;
 #if defined(__GNUC__) || defined(__clang__)
-    if constexpr (sizeof(bitmask_t) <= sizeof(unsigned int))
+    if constexpr (sizeof(bitmask_t) <= sizeof(unsigned int)) {
       return __builtin_ctz(static_cast<unsigned int>(mask));
-    else
-      return __builtin_ctzl(static_cast<unsigned long>(mask));
+    } else {
+      return __builtin_ctzl(static_cast<uint32_t>(mask));
+    }
 #else
     int bit = 0;
     while (bit < BitPolicy::MAX_BITS && !(mask & (static_cast<bitmask_t>(1) << bit))) {