[Bf-blender-cvs] [43ee4d5d7c6] master: Cleanup: quiet GCC -Wtype-limits

Campbell Barton noreply at git.blender.org
Mon May 14 09:00:56 CEST 2018


Commit: 43ee4d5d7c6743de6048658354ebaa202f23054d
Author: Campbell Barton
Date:   Mon May 14 08:58:09 2018 +0200
Branches: master
https://developer.blender.org/rB43ee4d5d7c6743de6048658354ebaa202f23054d

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.

===================================================================

M	source/blender/blenlib/BLI_utildefines.h

===================================================================

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



More information about the Bf-blender-cvs mailing list