Commit: 6be4abfebf0466b078d7c1dc9e26021299983bc8
Author: Lukas Tönne
Date: Wed Jun 18 09:53:54 2014 +0200
https://developer.blender.org/rB6be4abfebf0466b078d7c1dc9e26021299983bc8
Merge branch 'master' into depsgraph_refactor
===================================================================
===================================================================
diff --cc source/blender/blenlib/BLI_utildefines.h
index e5c941a,600476b..22a5030
--- a/source/blender/blenlib/BLI_utildefines.h
+++ b/source/blender/blenlib/BLI_utildefines.h
@@@ -331,11 -339,11 +339,11 @@@
#define STACK_PUSH(stack, val) (void)((stack)[(_##stack##_index)++] = val)
#define STACK_PUSH_RET(stack) ((void)stack, ((stack)[(_##stack##_index)++]))
#define STACK_PUSH_RET_PTR(stack) ((void)stack,
&((stack)[(_##stack##_index)++]))
- #define STACK_POP(stack) ((_##stack##_index) ?
((stack)[--(_##stack##_index)]) : NULL)
- #define STACK_POP_PTR(stack) ((_##stack##_index) ?
&((stack)[--(_##stack##_index)]) : NULL)
- #define STACK_POP_ELSE(stack, r) ((_##stack##_index) ?
((stack)[--(_##stack##_index)]) : r)
+ #define STACK_POP(stack) ((_##stack##_index) ?
((stack)[--(_##stack##_index)]) : NULL)
+ #define STACK_POP_PTR(stack) ((_##stack##_index) ?
&((stack)[--(_##stack##_index)]) : NULL)
+ #define STACK_POP_DEFAULT(stack, r) ((_##stack##_index) ?
((stack)[--(_##stack##_index)]) : r)
#define STACK_FREE(stack) ((void)stack)
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(__cplusplus)
#define STACK_SWAP(stack_a, stack_b) { \
SWAP(typeof(stack_a), stack_a, stack_b); \
SWAP(unsigned int, _##stack_a##_index, _##stack_b##_index); \
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
