From 9175489f65875534ee0c1d47268b0f22729ee895 Mon Sep 17 00:00:00 2001 From: Yuxuan Shui Date: Fri, 16 Feb 2024 12:41:27 +0000 Subject: [PATCH] utils: try to avoid variable shadowing in some macros Signed-off-by: Yuxuan Shui --- src/utils.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/utils.h b/src/utils.h index 5a42d99a..22da6c29 100644 --- a/src/utils.h +++ b/src/utils.h @@ -58,11 +58,11 @@ safe_isnan(double a) { /// being always true or false. #define ASSERT_IN_RANGE(var, lower, upper) \ do { \ - auto __tmp attr_unused = (var); \ + auto __assert_in_range_tmp attr_unused = (var); \ _Pragma("GCC diagnostic push"); \ _Pragma("GCC diagnostic ignored \"-Wtype-limits\""); \ - assert(__tmp >= lower); \ - assert(__tmp <= upper); \ + assert(__assert_in_range_tmp >= lower); \ + assert(__assert_in_range_tmp <= upper); \ _Pragma("GCC diagnostic pop"); \ } while (0) @@ -112,9 +112,10 @@ safe_isnan(double a) { #define to_u32_checked(val) \ ({ \ auto __to_tmp = (val); \ - int64_t max attr_unused = UINT32_MAX; /* silence clang tautological \ - comparison warning*/ \ - ASSERT_IN_RANGE(__to_tmp, 0, max); \ + int64_t __to_u32_max attr_unused = UINT32_MAX; /* silence clang \ + tautological \ + comparison warning */ \ + ASSERT_IN_RANGE(__to_tmp, 0, __to_u32_max); \ (uint32_t) __to_tmp; \ })