Cleanup: multistatement-macros warning

2017-07-29 08:18:20 +10:00
parent 0e26707bce
commit 361acb6991
2 changed files with 6 additions and 4 deletions
--- a/source/blender/blenlib/BLI_array.h
+++ b/source/blender/blenlib/BLI_array.h
@@ -135,11 +135,12 @@ void _bli_array_grow_func(void **arr_p, const void *arr_static,
 #define BLI_array_append_ret(arr) \
 	(BLI_array_reserve(arr, 1), &arr[(_##arr##_count++)])

-#define BLI_array_free(arr)                                                   \
+#define BLI_array_free(arr) {                                                 \
 	if (arr && (char *)arr != _##arr##_static) {                              \
 		BLI_array_fake_user(arr);                                             \
 		MEM_freeN(arr);                                                       \
-	} (void)0
+	} \
+} ((void)0)

 #define BLI_array_pop(arr)  (                                                 \
 	(arr && _##arr##_count) ?                                                 \