griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: quiet GCC -Wtype-limits

Browse Source 
While the warning can normally be disabled, we don't have have as much
control of warnings when macros are used.
This commit is contained in:
Campbell Barton
2018-05-14 08:58:09 +02:00
parent c1d737eb95
commit 43ee4d5d7c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenlib/BLI_utildefines.h
View File

@@ -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], \