Merge branch 'main' into add_inner_metric

alibaba · Jun 21, 2024 · cf51ebc · cf51ebc
2 parents 12a69e2 + 8c46806
commit cf51ebc
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/include/ylt/struct_pack/marco.h b/include/ylt/struct_pack/marco.h
@@ -31,19 +31,14 @@
 #define STRUCT_PACK_MAY_INLINE inline
 #endif
 
-#if __has_cpp_attribute(likely) && __cplusplus >= 202002L
+#if __has_cpp_attribute(likely) && __has_cpp_attribute(unlikely)
 #define SP_LIKELY(expr) (expr) [[likely]]
-#elif __GNUC__
-#define SP_LIKELY(expr) (__builtin_expect(!!(expr), 1))
-#else
-#define SP_LIKELY(expr) (expr)
-#endif
-
-#if __has_cpp_attribute(unlikely) && __cplusplus >= 202002L
 #define SP_UNLIKELY(expr) (expr) [[unlikely]]
 #elif __GNUC__
+#define SP_LIKELY(expr) (__builtin_expect(!!(expr), 1))
 #define SP_UNLIKELY(expr) (__builtin_expect(!!(expr), 0))
 #else
+#define SP_LIKELY(expr) (expr)
 #define SP_UNLIKELY(expr) (expr)
 #endif