From 996f9d4ff9744771c17178fb705a74fc2a9b8ac2 Mon Sep 17 00:00:00 2001 From: Abdelrahman Said Date: Fri, 2 Jan 2026 16:10:41 +0000 Subject: [PATCH] Update wapp_array_pop to fix MSVC warning --- src/base/array/array.c | 2 +- src/base/array/array.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/base/array/array.c b/src/base/array/array.c index 1b892d0..44d680c 100644 --- a/src/base/array/array.c +++ b/src/base/array/array.c @@ -8,7 +8,7 @@ #include #define _offset_pointer(PTR, OFFSET) ((void *)((uptr)(PTR) + (OFFSET))) -#define _array_header(ARRAY) (ArrayHeader *)(_offset_pointer(ARRAY, -sizeof(ArrayHeader))) +#define _array_header(ARRAY) (ArrayHeader *)(_offset_pointer(ARRAY, (i64)sizeof(ArrayHeader) * -1)) wapp_persist inline void _array_validate(const GenericArray array, u64 item_size); diff --git a/src/base/array/array.h b/src/base/array/array.h index 31bafea..142776c 100644 --- a/src/base/array/array.h +++ b/src/base/array/array.h @@ -110,9 +110,9 @@ typedef Str8 *Str8Array; }.items \ ) #define wapp_array_pop(TYPE, ARRAY) \ - (ARRAY != NULL && _array_count((GenericArray)ARRAY) > 0 ? \ - *((TYPE *)_array_pop((GenericArray)ARRAY, sizeof(TYPE))) : \ - (TYPE){0} \ + (ARRAY == NULL || _array_count((GenericArray)ARRAY) == 0 ? \ + (TYPE){0} : \ + *((TYPE *)_array_pop((GenericArray)ARRAY, sizeof(TYPE))) \ ) #endif // !WAPP_PLATFORM_CPP