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 | |
parent | fea07c1a63fdfe3bf25d77d862e83bdf024347b8 (diff) |
Cleanup: quiet -Wcomma, cast to void where needed
Diffstat (limited to 'source/blender/bmesh/intern')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_core.c | 3 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_interp.c | 8 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_operator_api_inline.h | 6 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_polygon_edgenet.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_queries.c | 4 |
5 files changed, 12 insertions, 11 deletions
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index 84d69fa65d4..88fcf6a4536 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -2497,7 +2497,8 @@ static void bmesh_vert_separate__cleanup(BMesh *bm, LinkNode *edges_separate) n_prev->next = n_step->next; n_step = n_prev; } - } while ((n_prev = n_step), + } while ((void) + (n_prev = n_step), (n_step = n_step->next)); } while ((n_orig = n_orig->next) && n_orig->next); diff --git a/source/blender/bmesh/intern/bmesh_interp.c b/source/blender/bmesh/intern/bmesh_interp.c index a2ae5d15095..f51013c3f1c 100644 --- a/source/blender/bmesh/intern/bmesh_interp.c +++ b/source/blender/bmesh/intern/bmesh_interp.c @@ -197,7 +197,7 @@ void BM_face_interp_from_face_ex( if (do_vertex) { CustomData_bmesh_interp(&bm->vdata, blocks_v, w, NULL, f_src->len, l_iter->v->head.data); } - } while (i++, (l_iter = l_iter->next) != l_first); + } while ((void)i++, (l_iter = l_iter->next) != l_first); } void BM_face_interp_from_face(BMesh *bm, BMFace *f_dst, const BMFace *f_src, const bool do_vertex) @@ -221,7 +221,7 @@ void BM_face_interp_from_face(BMesh *bm, BMFace *f_dst, const BMFace *f_src, con mul_v2_m3v3(cos_2d[i], axis_mat, l_iter->v->co); blocks_l[i] = l_iter->head.data; if (do_vertex) blocks_v[i] = l_iter->v->head.data; - } while (i++, (l_iter = l_iter->next) != l_first); + } while ((void)i++, (l_iter = l_iter->next) != l_first); BM_face_interp_from_face_ex(bm, f_dst, f_src, do_vertex, blocks_l, blocks_v, cos_2d, axis_mat); @@ -650,7 +650,7 @@ void BM_loop_interp_from_face( if (do_vertex) { vblocks[i] = l_iter->v->head.data; } - } while (i++, (l_iter = l_iter->next) != l_first); + } while ((void)i++, (l_iter = l_iter->next) != l_first); mul_v2_m3v3(co, axis_mat, l_dst->v->co); @@ -687,7 +687,7 @@ void BM_vert_interp_from_face(BMesh *bm, BMVert *v_dst, const BMFace *f_src) do { mul_v2_m3v3(cos_2d[i], axis_mat, l_iter->v->co); blocks[i] = l_iter->v->head.data; - } while (i++, (l_iter = l_iter->next) != l_first); + } while ((void)i++, (l_iter = l_iter->next) != l_first); mul_v2_m3v3(co, axis_mat, v_dst->co); 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)); } diff --git a/source/blender/bmesh/intern/bmesh_polygon_edgenet.c b/source/blender/bmesh/intern/bmesh_polygon_edgenet.c index 1ee96d4e759..508a9e660f3 100644 --- a/source/blender/bmesh/intern/bmesh_polygon_edgenet.c +++ b/source/blender/bmesh/intern/bmesh_polygon_edgenet.c @@ -509,7 +509,7 @@ bool BM_face_split_edgenet( mul_v2_m3v3(cos_2d[i], axis_mat, l_iter->v->co); blocks[i] = l_iter->head.data; - } while (i++, (l_iter = l_iter->next) != l_first); + } while ((void)i++, (l_iter = l_iter->next) != l_first); for (i = 0; i < edge_net_len; i++) { diff --git a/source/blender/bmesh/intern/bmesh_queries.c b/source/blender/bmesh/intern/bmesh_queries.c index 30f4dc5cb2a..ffad3e59e47 100644 --- a/source/blender/bmesh/intern/bmesh_queries.c +++ b/source/blender/bmesh/intern/bmesh_queries.c @@ -1951,7 +1951,7 @@ bool BM_face_exists(BMVert **varr, int len, BMFace **r_existface) if (l_walk->v != varr[i_walk]) { break; } - } while ((l_walk = l_walk->next), ++i_walk != len); + } while ((void)(l_walk = l_walk->next), ++i_walk != len); } else if (l_iter_radial->prev->v == varr[1]) { BMLoop *l_walk = l_iter_radial->prev->prev; @@ -1959,7 +1959,7 @@ bool BM_face_exists(BMVert **varr, int len, BMFace **r_existface) if (l_walk->v != varr[i_walk]) { break; } - } while ((l_walk = l_walk->prev), ++i_walk != len); + } while ((void)(l_walk = l_walk->prev), ++i_walk != len); } if (i_walk == len) { |