From 984b279ef143c82d1f45cbd3e846aa15bcd47997 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 12 Oct 2022 10:27:27 +1100 Subject: Cleanup: use commented arguments for unused args in C++ --- source/blender/blenkernel/intern/DerivedMesh.cc | 2 +- source/blender/blenkernel/intern/editmesh.cc | 2 +- source/blender/blenkernel/intern/mesh_iterators.cc | 2 +- source/blender/blenkernel/intern/subdiv_ccg.cc | 23 +++++++++++----------- 4 files changed, 14 insertions(+), 15 deletions(-) (limited to 'source/blender/blenkernel/intern') diff --git a/source/blender/blenkernel/intern/DerivedMesh.cc b/source/blender/blenkernel/intern/DerivedMesh.cc index b4cc46619a7..742f20fa65f 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.cc +++ b/source/blender/blenkernel/intern/DerivedMesh.cc @@ -1899,7 +1899,7 @@ struct MappedUserData { static void make_vertexcos__mapFunc(void *userData, int index, const float co[3], - const float UNUSED(no[3])) + const float /*no*/[3]) { MappedUserData *mappedData = (MappedUserData *)userData; diff --git a/source/blender/blenkernel/intern/editmesh.cc b/source/blender/blenkernel/intern/editmesh.cc index 3a1dcd59f55..2ed5ec7469f 100644 --- a/source/blender/blenkernel/intern/editmesh.cc +++ b/source/blender/blenkernel/intern/editmesh.cc @@ -189,7 +189,7 @@ struct CageUserData { static void cage_mapped_verts_callback(void *userData, int index, const float co[3], - const float UNUSED(no[3])) + const float /*no*/[3]) { CageUserData *data = static_cast(userData); diff --git a/source/blender/blenkernel/intern/mesh_iterators.cc b/source/blender/blenkernel/intern/mesh_iterators.cc index 46f9780f891..cf2518d7c9b 100644 --- a/source/blender/blenkernel/intern/mesh_iterators.cc +++ b/source/blender/blenkernel/intern/mesh_iterators.cc @@ -364,7 +364,7 @@ struct MappedVCosData { static void get_vertexcos__mapFunc(void *user_data, int index, const float co[3], - const float UNUSED(no[3])) + const float /*no*/[3]) { MappedVCosData *mapped_vcos_data = (MappedVCosData *)user_data; diff --git a/source/blender/blenkernel/intern/subdiv_ccg.cc b/source/blender/blenkernel/intern/subdiv_ccg.cc index 6f583f760ef..feee7ac0f0f 100644 --- a/source/blender/blenkernel/intern/subdiv_ccg.cc +++ b/source/blender/blenkernel/intern/subdiv_ccg.cc @@ -286,7 +286,7 @@ static void subdiv_ccg_eval_special_grid(CCGEvalGridsData *data, const int face_ static void subdiv_ccg_eval_grids_task(void *__restrict userdata_v, const int face_index, - const TaskParallelTLS *__restrict UNUSED(tls)) + const TaskParallelTLS *__restrict /*tls*/) { CCGEvalGridsData *data = static_cast(userdata_v); SubdivCCG *subdiv_ccg = data->subdiv_ccg; @@ -779,7 +779,7 @@ static void subdiv_ccg_recalc_inner_normal_task(void *__restrict userdata_v, subdiv_ccg_average_inner_face_normals(data->subdiv_ccg, data->key, tls, grid_index); } -static void subdiv_ccg_recalc_inner_normal_free(const void *__restrict UNUSED(userdata), +static void subdiv_ccg_recalc_inner_normal_free(const void *__restrict /*userdata*/, void *__restrict tls_v) { RecalcInnerNormalsTLSData *tls = static_cast(tls_v); @@ -842,7 +842,7 @@ static void subdiv_ccg_recalc_modified_inner_normal_task(void *__restrict userda subdiv_ccg_average_inner_face_grids(subdiv_ccg, key, face); } -static void subdiv_ccg_recalc_modified_inner_normal_free(const void *__restrict UNUSED(userdata), +static void subdiv_ccg_recalc_modified_inner_normal_free(const void *__restrict /*userdata*/, void *__restrict tls_v) { RecalcInnerNormalsTLSData *tls = static_cast(tls_v); @@ -1016,7 +1016,7 @@ static void subdiv_ccg_average_inner_face_grids(SubdivCCG *subdiv_ccg, static void subdiv_ccg_average_inner_grids_task(void *__restrict userdata_v, const int face_index, - const TaskParallelTLS *__restrict UNUSED(tls_v)) + const TaskParallelTLS *__restrict /*tls_v*/) { AverageInnerGridsData *data = static_cast(userdata_v); SubdivCCG *subdiv_ccg = data->subdiv_ccg; @@ -1095,7 +1095,7 @@ static void subdiv_ccg_average_grids_boundaries_task(void *__restrict userdata_v subdiv_ccg_average_grids_boundary(subdiv_ccg, key, adjacent_edge, tls); } -static void subdiv_ccg_average_grids_boundaries_free(const void *__restrict UNUSED(userdata), +static void subdiv_ccg_average_grids_boundaries_free(const void *__restrict /*userdata*/, void *__restrict tls_v) { AverageGridsBoundariesTLSData *tls = static_cast(tls_v); @@ -1137,7 +1137,7 @@ static void subdiv_ccg_average_grids_corners(SubdivCCG *subdiv_ccg, static void subdiv_ccg_average_grids_corners_task(void *__restrict userdata_v, const int n, - const TaskParallelTLS *__restrict UNUSED(tls_v)) + const TaskParallelTLS *__restrict /*tls_v*/) { AverageGridsCornerData *data = static_cast(userdata_v); const int adjacent_vertex_index = data->adjacent_vert_index_map ? @@ -1323,10 +1323,9 @@ struct StitchFacesInnerGridsData { CCGFace **effected_ccg_faces; }; -static void subdiv_ccg_stitch_face_inner_grids_task( - void *__restrict userdata_v, - const int face_index, - const TaskParallelTLS *__restrict UNUSED(tls_v)) +static void subdiv_ccg_stitch_face_inner_grids_task(void *__restrict userdata_v, + const int face_index, + const TaskParallelTLS *__restrict /*tls_v*/) { StitchFacesInnerGridsData *data = static_cast(userdata_v); SubdivCCG *subdiv_ccg = data->subdiv_ccg; @@ -1447,7 +1446,7 @@ BLI_INLINE bool is_inner_edge_grid_coordinate(const SubdivCCG *subdiv_ccg, return false; } -BLI_INLINE SubdivCCGCoord coord_at_prev_row(const SubdivCCG *UNUSED(subdiv_ccg), +BLI_INLINE SubdivCCGCoord coord_at_prev_row(const SubdivCCG * /*subdiv_ccg*/, const SubdivCCGCoord *coord) { BLI_assert(coord->y > 0); @@ -1465,7 +1464,7 @@ BLI_INLINE SubdivCCGCoord coord_at_next_row(const SubdivCCG *subdiv_ccg, return result; } -BLI_INLINE SubdivCCGCoord coord_at_prev_col(const SubdivCCG *UNUSED(subdiv_ccg), +BLI_INLINE SubdivCCGCoord coord_at_prev_col(const SubdivCCG * /*subdiv_ccg*/, const SubdivCCGCoord *coord) { BLI_assert(coord->x > 0); -- cgit v1.2.3