diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-03-05 01:16:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-03-05 01:16:12 +0300 |
| commit | 4e500101a7dd3ea578ca6d6f101c0d9ece7f5abc (patch) | |
| tree | b84e5af642e8f702c2bc34a26155a49284fbda9b /source/blender/bmesh/intern/bmesh_operator_api_inline.h | |
| parent | fea07c1a63fdfe3bf25d77d862e83bdf024347b8 (diff) | |
Cleanup: quiet -Wcomma, cast to void where needed
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_operator_api_inline.h')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_operator_api_inline.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/bmesh/intern/bmesh_operator_api_inline.h b/source/blender/bmesh/intern/bmesh_operator_api_inline.h index 95c4f710c38..00fcd9e7a9b 100644 --- a/source/blender/bmesh/intern/bmesh_operator_api_inline.h +++ b/source/blender/bmesh/intern/bmesh_operator_api_inline.h @@ -82,7 +82,7 @@ BLI_INLINE void BMO_slot_map_int_insert( { union { void *ptr; int val; } t = {NULL}; BLI_assert(slot->slot_subtype.map == BMO_OP_SLOT_SUBTYPE_MAP_INT); - BMO_slot_map_insert(op, slot, element, ((t.val = val), t.ptr)); + BMO_slot_map_insert(op, slot, element, ((void)(t.val = val), t.ptr)); } ATTR_NONNULL(1, 2) @@ -92,7 +92,7 @@ BLI_INLINE void BMO_slot_map_bool_insert( { union { void *ptr; bool val; } t = {NULL}; BLI_assert(slot->slot_subtype.map == BMO_OP_SLOT_SUBTYPE_MAP_BOOL); - BMO_slot_map_insert(op, slot, element, ((t.val = val), t.ptr)); + BMO_slot_map_insert(op, slot, element, ((void)(t.val = val), t.ptr)); } ATTR_NONNULL(1, 2) @@ -102,7 +102,7 @@ BLI_INLINE void BMO_slot_map_float_insert( { union { void *ptr; float val; } t = {NULL}; BLI_assert(slot->slot_subtype.map == BMO_OP_SLOT_SUBTYPE_MAP_FLT); - BMO_slot_map_insert(op, slot, element, ((t.val = val), t.ptr)); + BMO_slot_map_insert(op, slot, element, ((void)(t.val = val), t.ptr)); } |