Don't use [[unlikely]]

daschuer · Oct 6, 2023 · 5887690 · 5887690
1 parent d444dd3
commit 5887690
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/util/assert.h b/src/util/assert.h
@@ -39,7 +39,7 @@ inline void mixxx_release_assert(const char* assertion, const char* file, int li
 /// corrupting user data. Handle errors gracefully whenever possible.
 #define RELEASE_ASSERT(cond)                                                  \
     do                                                                        \
-        if (!static_cast<bool>(cond)) [[unlikely]] {                          \
+        if (Q_UNLIKELY(!static_cast<bool>(cond))) {                           \
             mixxx_release_assert(#cond, __FILE__, __LINE__, ASSERT_FUNCTION); \
         }                                                                     \
     while (0)
@@ -56,7 +56,7 @@ inline void mixxx_release_assert(const char* assertion, const char* file, int li
 #ifdef MIXXX_DEBUG_ASSERTIONS_ENABLED
 #define DEBUG_ASSERT(cond)                                                  \
     do                                                                      \
-        if (!static_cast<bool>(cond)) [[unlikely]] {                        \
+        if (Q_UNLIKELY(!static_cast<bool>(cond))) {                         \
             mixxx_debug_assert(#cond, __FILE__, __LINE__, ASSERT_FUNCTION); \
         }                                                                   \
     while (0)
@@ -80,5 +80,5 @@ inline void mixxx_release_assert(const char* assertion, const char* file, int li
     if (Q_UNLIKELY(!static_cast<bool>(cond)) && \
             mixxx_debug_assert_return_true(#cond, __FILE__, __LINE__, ASSERT_FUNCTION))
 #else
-#define VERIFY_OR_DEBUG_ASSERT(cond) if (!static_cast<bool>(cond)) [[unlikely]]
+#define VERIFY_OR_DEBUG_ASSERT(cond) if (Q_UNLIKELY(!static_cast<bool>(cond)))
 #endif