From 43ee4d5d7c6743de6048658354ebaa202f23054d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 14 May 2018 08:58:09 +0200 Subject: Cleanup: quiet GCC -Wtype-limits While the warning can normally be disabled, we don't have have as much control of warnings when macros are used. --- source/blender/blenlib/BLI_utildefines.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/blenlib') diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h index 5af97ebb411..c0b76aa9cbf 100644 --- a/source/blender/blenlib/BLI_utildefines.h +++ b/source/blender/blenlib/BLI_utildefines.h @@ -385,7 +385,7 @@ extern "C" { */ #define ARRAY_DELETE(arr, index, delete_len, arr_len) \ { \ - BLI_assert(((index) >= 0) && ((index) + delete_len <= arr_len)); \ + BLI_assert((&arr[index] >= arr) && ((index) + delete_len <= arr_len)); \ memmove(&(arr)[index], \ &(arr)[(index) + (delete_len)], \ (((arr_len) - (index)) - (delete_len)) * sizeof(*(arr))); \ @@ -400,7 +400,7 @@ extern "C" { */ #define ARRAY_DELETE_REORDER_LAST(arr, index, delete_len, arr_len) \ { \ - BLI_assert(((index) >= 0) && ((index) + delete_len <= arr_len)); \ + BLI_assert((&arr[index] >= arr) && ((index) + delete_len <= arr_len)); \ if ((index) + (delete_len) != (arr_len)) { \ if (((delete_len) == 1) || ((delete_len) <= ((arr_len) - ((index) + (delete_len))))) { \ memcpy(&(arr)[index], \ -- cgit v1.2.3