#1509 Fix warnings in enum.hpp high bit calculation

SanderMertens · Jan 10, 2025 · fbb7c0c · fbb7c0c
1 parent 95bf590
commit fbb7c0c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/distr/flecs.h b/distr/flecs.h
@@ -18053,8 +18053,10 @@ struct enum_reflection {
     static constexpr U each_enum(Args... args) {
         return each_mask_range<Value, high_bit>(each_enum_range<0, Value>(0, args...), args...);
     }
-
-    static const U high_bit = static_cast<U>(1) << (sizeof(U) * 8 - 1);
+    /* to avoid warnings with bit manipulation, calculate the high bit with an
+       unsigned type of the same size: */
+    using UU = typename std::make_unsigned<U>::type;
+    static const U high_bit = static_cast<U>(static_cast<UU>(1) << (sizeof(UU) * 8 - 1));
 };
 
 /** Enumeration type data */

diff --git a/include/flecs/addons/cpp/utils/enum.hpp b/include/flecs/addons/cpp/utils/enum.hpp
@@ -260,8 +260,10 @@ struct enum_reflection {
     static constexpr U each_enum(Args... args) {
         return each_mask_range<Value, high_bit>(each_enum_range<0, Value>(0, args...), args...);
     }
-
-    static const U high_bit = static_cast<U>(1) << (sizeof(U) * 8 - 1);
+    /* to avoid warnings with bit manipulation, calculate the high bit with an
+       unsigned type of the same size: */
+    using UU = typename std::make_unsigned<U>::type;
+    static const U high_bit = static_cast<U>(static_cast<UU>(1) << (sizeof(UU) * 8 - 1));
 };
 
 /** Enumeration type data */