diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-06-18 08:00:58 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-06-18 08:02:41 +0400 |
| commit | a82d3f85c689056681ba608624e8326c09415293 (patch) | |
| tree | 8ea0d6cb9d7ecbaa6f7a8fa158f886c1a895914a /source/blender/blenlib/BLI_linklist_stack.h | |
| parent | 3a101d8c92730d7b98732710e41aafd940a31aff (diff) | |
Correct casts for IS_EQ and other macro tweaks
- ensure GET_INT_FROM_POINTER us only used to get values
- rename STACK_POP_ELSE -> STACK_POP_DEFAULT
Diffstat (limited to 'source/blender/blenlib/BLI_linklist_stack.h')
| -rw-r--r-- | source/blender/blenlib/BLI_linklist_stack.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenlib/BLI_linklist_stack.h b/source/blender/blenlib/BLI_linklist_stack.h index 5f4f98c5a4f..d3d1924628c 100644 --- a/source/blender/blenlib/BLI_linklist_stack.h +++ b/source/blender/blenlib/BLI_linklist_stack.h @@ -69,14 +69,14 @@ BLI_linklist_prepend_pool(&(var), ptr, _##var##_pool)) #define BLI_LINKSTACK_POP(var) \ (var ? (typeof(_##var##_type))BLI_linklist_pop_pool(&(var), _##var##_pool) : NULL) -#define BLI_LINKSTACK_POP_ELSE(var, r) \ +#define BLI_LINKSTACK_POP_DEFAULT(var, r) \ (var ? (typeof(_##var##_type))BLI_linklist_pop_pool(&(var), _##var##_pool) : r) #else /* non gcc */ #define BLI_LINKSTACK_PUSH(var, ptr) ( \ BLI_linklist_prepend_pool(&(var), ptr, _##var##_pool)) #define BLI_LINKSTACK_POP(var) \ (var ? BLI_linklist_pop_pool(&(var), _##var##_pool) : NULL) -#define BLI_LINKSTACK_POP_ELSE(var, r) \ +#define BLI_LINKSTACK_POP_DEFAULT(var, r) \ (var ? BLI_linklist_pop_pool(&(var), _##var##_pool) : r) #endif /* gcc check */ |