diff options
Diffstat (limited to 'source/blender/blenlib')
23 files changed, 62 insertions, 63 deletions
diff --git a/source/blender/blenlib/BLI_allocator.hh b/source/blender/blenlib/BLI_allocator.hh index 149dda5a50e..db3caf2eeb7 100644 --- a/source/blender/blenlib/BLI_allocator.hh +++ b/source/blender/blenlib/BLI_allocator.hh @@ -63,7 +63,7 @@ class RawAllocator { }; public: - void *allocate(size_t size, size_t alignment, const char *UNUSED(name)) + void *allocate(size_t size, size_t alignment, const char * /*name*/) { BLI_assert(is_power_of_2_i(int(alignment))); void *ptr = malloc(size + alignment + sizeof(MemHead)); diff --git a/source/blender/blenlib/BLI_generic_virtual_array.hh b/source/blender/blenlib/BLI_generic_virtual_array.hh index 9545eaf9622..e8a27cea6d8 100644 --- a/source/blender/blenlib/BLI_generic_virtual_array.hh +++ b/source/blender/blenlib/BLI_generic_virtual_array.hh @@ -78,7 +78,7 @@ class GVMutableArrayImpl : public GVArrayImpl { namespace detail { struct GVArrayAnyExtraInfo { const GVArrayImpl *(*get_varray)(const void *buffer) = - [](const void *UNUSED(buffer)) -> const GVArrayImpl * { return nullptr; }; + [](const void * /*buffer*/) -> const GVArrayImpl * { return nullptr; }; template<typename StorageT> static constexpr GVArrayAnyExtraInfo get(); }; diff --git a/source/blender/blenlib/BLI_generic_virtual_vector_array.hh b/source/blender/blenlib/BLI_generic_virtual_vector_array.hh index 364b1ab33c7..373d010d926 100644 --- a/source/blender/blenlib/BLI_generic_virtual_vector_array.hh +++ b/source/blender/blenlib/BLI_generic_virtual_vector_array.hh @@ -133,8 +133,8 @@ class GVVectorArray_For_SingleGSpan : public GVVectorArray { } protected: - int64_t get_vector_size_impl(int64_t UNUSED(index)) const override; - void get_vector_element_impl(int64_t UNUSED(index), + int64_t get_vector_size_impl(int64_t /*index*/) const override; + void get_vector_element_impl(int64_t /*index*/, int64_t index_in_vector, void *r_value) const override; diff --git a/source/blender/blenlib/BLI_map.hh b/source/blender/blenlib/BLI_map.hh index 9fc5614c189..6d281420c47 100644 --- a/source/blender/blenlib/BLI_map.hh +++ b/source/blender/blenlib/BLI_map.hh @@ -1332,7 +1332,7 @@ template<typename Key, typename Value> class StdUnorderedMapWrapper { map_.clear(); } - void print_stats(StringRef UNUSED(name) = "") const + void print_stats(StringRef /*name*/ = "") const { } }; diff --git a/source/blender/blenlib/BLI_map_slots.hh b/source/blender/blenlib/BLI_map_slots.hh index 6426216913f..eb2c1a7f5cf 100644 --- a/source/blender/blenlib/BLI_map_slots.hh +++ b/source/blender/blenlib/BLI_map_slots.hh @@ -169,7 +169,7 @@ template<typename Key, typename Value> class SimpleMapSlot { * key. The hash can be used by other slot implementations to determine inequality faster. */ template<typename ForwardKey, typename IsEqual> - bool contains(const ForwardKey &key, const IsEqual &is_equal, uint64_t UNUSED(hash)) const + bool contains(const ForwardKey &key, const IsEqual &is_equal, uint64_t /*hash*/) const { if (state_ == Occupied) { return is_equal(key, *key_buffer_); @@ -194,7 +194,7 @@ template<typename Key, typename Value> class SimpleMapSlot { * Change the state of this slot from empty/removed to occupied. The value is assumed to be * constructed already. */ - template<typename ForwardKey> void occupy_no_value(ForwardKey &&key, uint64_t UNUSED(hash)) + template<typename ForwardKey> void occupy_no_value(ForwardKey &&key, uint64_t /*hash*/) { BLI_assert(!this->is_occupied()); try { @@ -295,7 +295,7 @@ template<typename Key, typename Value, typename KeyInfo> class IntrusiveMapSlot } template<typename ForwardKey, typename IsEqual> - bool contains(const ForwardKey &key, const IsEqual &is_equal, uint64_t UNUSED(hash)) const + bool contains(const ForwardKey &key, const IsEqual &is_equal, uint64_t /*hash*/) const { BLI_assert(KeyInfo::is_not_empty_or_removed(key)); return is_equal(key, key_); @@ -310,7 +310,7 @@ template<typename Key, typename Value, typename KeyInfo> class IntrusiveMapSlot this->occupy_no_value(std::forward<ForwardKey>(key), hash); } - template<typename ForwardKey> void occupy_no_value(ForwardKey &&key, uint64_t UNUSED(hash)) + template<typename ForwardKey> void occupy_no_value(ForwardKey &&key, uint64_t /*hash*/) { BLI_assert(!this->is_occupied()); BLI_assert(KeyInfo::is_not_empty_or_removed(key)); diff --git a/source/blender/blenlib/BLI_set_slots.hh b/source/blender/blenlib/BLI_set_slots.hh index 805c194ac90..8ef49e0a2d0 100644 --- a/source/blender/blenlib/BLI_set_slots.hh +++ b/source/blender/blenlib/BLI_set_slots.hh @@ -129,7 +129,7 @@ template<typename Key> class SimpleSetSlot { * key. The hash is used by other slot implementations to determine inequality faster. */ template<typename ForwardKey, typename IsEqual> - bool contains(const ForwardKey &key, const IsEqual &is_equal, uint64_t UNUSED(hash)) const + bool contains(const ForwardKey &key, const IsEqual &is_equal, uint64_t /*hash*/) const { if (state_ == Occupied) { return is_equal(key, *key_buffer_); @@ -141,7 +141,7 @@ template<typename Key> class SimpleSetSlot { * Change the state of this slot from empty/removed to occupied. The key has to be constructed * by calling the constructor with the given key as parameter. */ - template<typename ForwardKey> void occupy(ForwardKey &&key, uint64_t UNUSED(hash)) + template<typename ForwardKey> void occupy(ForwardKey &&key, uint64_t /*hash*/) { BLI_assert(!this->is_occupied()); new (&key_buffer_) Key(std::forward<ForwardKey>(key)); @@ -226,7 +226,7 @@ template<typename Key> class HashedSetSlot { return state_ == Empty; } - template<typename Hash> uint64_t get_hash(const Hash &UNUSED(hash)) const + template<typename Hash> uint64_t get_hash(const Hash & /*hash*/) const { BLI_assert(this->is_occupied()); return hash_; @@ -306,13 +306,13 @@ template<typename Key, typename KeyInfo> class IntrusiveSetSlot { } template<typename ForwardKey, typename IsEqual> - bool contains(const ForwardKey &key, const IsEqual &is_equal, const uint64_t UNUSED(hash)) const + bool contains(const ForwardKey &key, const IsEqual &is_equal, const uint64_t /*hash*/) const { BLI_assert(KeyInfo::is_not_empty_or_removed(key)); return is_equal(key_, key); } - template<typename ForwardKey> void occupy(ForwardKey &&key, const uint64_t UNUSED(hash)) + template<typename ForwardKey> void occupy(ForwardKey &&key, const uint64_t /*hash*/) { BLI_assert(!this->is_occupied()); BLI_assert(KeyInfo::is_not_empty_or_removed(key)); diff --git a/source/blender/blenlib/BLI_vector_set_slots.hh b/source/blender/blenlib/BLI_vector_set_slots.hh index 35dedd57705..cc7f5d1ff1e 100644 --- a/source/blender/blenlib/BLI_vector_set_slots.hh +++ b/source/blender/blenlib/BLI_vector_set_slots.hh @@ -73,7 +73,7 @@ template<typename Key> class SimpleVectorSetSlot { template<typename ForwardKey, typename IsEqual> bool contains(const ForwardKey &key, const IsEqual &is_equal, - uint64_t UNUSED(hash), + uint64_t /*hash*/, const Key *keys) const { if (state_ >= 0) { @@ -86,7 +86,7 @@ template<typename Key> class SimpleVectorSetSlot { * Change the state of this slot from empty/removed to occupied. The hash can be used by other * slot implementations. */ - void occupy(int64_t index, uint64_t UNUSED(hash)) + void occupy(int64_t index, uint64_t /*hash*/) { BLI_assert(!this->is_occupied()); state_ = index; diff --git a/source/blender/blenlib/BLI_virtual_array.hh b/source/blender/blenlib/BLI_virtual_array.hh index 217c8c00d66..36f5065c022 100644 --- a/source/blender/blenlib/BLI_virtual_array.hh +++ b/source/blender/blenlib/BLI_virtual_array.hh @@ -155,7 +155,7 @@ template<typename T> class VArrayImpl { * arrays in all cases. * Return true when the virtual array was assigned and false when nothing was done. */ - virtual bool try_assign_GVArray(GVArray &UNUSED(varray)) const + virtual bool try_assign_GVArray(GVArray & /*varray*/) const { return false; } @@ -164,7 +164,7 @@ template<typename T> class VArrayImpl { * Return true when the other virtual array should be considered to be the same, e.g. because it * shares the same underlying memory. */ - virtual bool is_same(const VArrayImpl<T> &UNUSED(other)) const + virtual bool is_same(const VArrayImpl<T> & /*other*/) const { return false; } @@ -201,7 +201,7 @@ template<typename T> class VMutableArrayImpl : public VArrayImpl<T> { /** * Similar to #VArrayImpl::try_assign_GVArray but for mutable virtual arrays. */ - virtual bool try_assign_GVMutableArray(GVMutableArray &UNUSED(varray)) const + virtual bool try_assign_GVMutableArray(GVMutableArray & /*varray*/) const { return false; } @@ -346,7 +346,7 @@ template<typename T> class VArrayImpl_For_Single final : public VArrayImpl<T> { } protected: - T get(const int64_t UNUSED(index)) const override + T get(const int64_t /*index*/) const override { return value_; } diff --git a/source/blender/blenlib/intern/delaunay_2d.cc b/source/blender/blenlib/intern/delaunay_2d.cc index 6280fe1010f..afecf9ea838 100644 --- a/source/blender/blenlib/intern/delaunay_2d.cc +++ b/source/blender/blenlib/intern/delaunay_2d.cc @@ -45,7 +45,7 @@ template<> double math_abs<double>(const double v) return fabs(v); } -template<typename T> double math_to_double(const T UNUSED(v)) +template<typename T> double math_to_double(const T /*v*/) { BLI_assert(false); /* Need implementation for other type. */ return 0.0; @@ -2645,7 +2645,7 @@ void prepare_cdt_for_output(CDT_state<T> *cdt_state, const CDT_output_type outpu template<typename T> CDT_result<T> get_cdt_output(CDT_state<T> *cdt_state, - const CDT_input<T> UNUSED(input), + const CDT_input<T> /*input*/, CDT_output_type output_type) { CDT_output_type oty = output_type; diff --git a/source/blender/blenlib/intern/generic_virtual_array.cc b/source/blender/blenlib/intern/generic_virtual_array.cc index f66b1e14fc6..b0623175dc7 100644 --- a/source/blender/blenlib/intern/generic_virtual_array.cc +++ b/source/blender/blenlib/intern/generic_virtual_array.cc @@ -51,7 +51,7 @@ CommonVArrayInfo GVArrayImpl::common_info() const return {}; } -bool GVArrayImpl::try_assign_VArray(void *UNUSED(varray)) const +bool GVArrayImpl::try_assign_VArray(void * /*varray*/) const { return false; } @@ -102,7 +102,7 @@ void GVMutableArray::fill(const void *value) } } -bool GVMutableArrayImpl::try_assign_VMutableArray(void *UNUSED(varray)) const +bool GVMutableArrayImpl::try_assign_VMutableArray(void * /*varray*/) const { return false; } @@ -172,11 +172,11 @@ void GVArrayImpl_For_GSpan::materialize_compressed_to_uninitialized(const IndexM /* Generic virtual array where each element has the same value. The value is not owned. */ -void GVArrayImpl_For_SingleValueRef::get(const int64_t UNUSED(index), void *r_value) const +void GVArrayImpl_For_SingleValueRef::get(const int64_t /*index*/, void *r_value) const { type_->copy_assign(value_, r_value); } -void GVArrayImpl_For_SingleValueRef::get_to_uninitialized(const int64_t UNUSED(index), +void GVArrayImpl_For_SingleValueRef::get_to_uninitialized(const int64_t /*index*/, void *r_value) const { type_->copy_construct(value_, r_value); @@ -261,11 +261,11 @@ template<int BufferSize> class GVArrayImpl_For_SmallTrivialSingleValue : public } private: - void get(const int64_t UNUSED(index), void *r_value) const override + void get(const int64_t /*index*/, void *r_value) const override { this->copy_value_to(r_value); } - void get_to_uninitialized(const int64_t UNUSED(index), void *r_value) const override + void get_to_uninitialized(const int64_t /*index*/, void *r_value) const override { this->copy_value_to(r_value); } diff --git a/source/blender/blenlib/intern/generic_virtual_vector_array.cc b/source/blender/blenlib/intern/generic_virtual_vector_array.cc index 8fd1fb50b72..5d6985e16c8 100644 --- a/source/blender/blenlib/intern/generic_virtual_vector_array.cc +++ b/source/blender/blenlib/intern/generic_virtual_vector_array.cc @@ -16,12 +16,12 @@ void GVArray_For_GVVectorArrayIndex::get_to_uninitialized(const int64_t index_in vector_array_.get_vector_element(index_, index_in_vector, r_value); } -int64_t GVVectorArray_For_SingleGVArray::get_vector_size_impl(const int64_t UNUSED(index)) const +int64_t GVVectorArray_For_SingleGVArray::get_vector_size_impl(const int64_t /*index*/) const { return varray_.size(); } -void GVVectorArray_For_SingleGVArray::get_vector_element_impl(const int64_t UNUSED(index), +void GVVectorArray_For_SingleGVArray::get_vector_element_impl(const int64_t /*index*/, const int64_t index_in_vector, void *r_value) const { @@ -33,12 +33,12 @@ bool GVVectorArray_For_SingleGVArray::is_single_vector_impl() const return true; } -int64_t GVVectorArray_For_SingleGSpan::get_vector_size_impl(const int64_t UNUSED(index)) const +int64_t GVVectorArray_For_SingleGSpan::get_vector_size_impl(const int64_t /*index*/) const { return span_.size(); } -void GVVectorArray_For_SingleGSpan::get_vector_element_impl(const int64_t UNUSED(index), +void GVVectorArray_For_SingleGSpan::get_vector_element_impl(const int64_t /*index*/, const int64_t index_in_vector, void *r_value) const { diff --git a/source/blender/blenlib/intern/mesh_boolean.cc b/source/blender/blenlib/intern/mesh_boolean.cc index 0d8ad1da582..3efe62d2984 100644 --- a/source/blender/blenlib/intern/mesh_boolean.cc +++ b/source/blender/blenlib/intern/mesh_boolean.cc @@ -2527,7 +2527,7 @@ class InsideShapeTestData { static void inside_shape_callback(void *userdata, int index, const BVHTreeRay *ray, - BVHTreeRayHit *UNUSED(hit)) + BVHTreeRayHit * /*hit*/) { const int dbg_level = 0; if (dbg_level > 0) { diff --git a/source/blender/blenlib/intern/mesh_intersect.cc b/source/blender/blenlib/intern/mesh_intersect.cc index 7553898f5d3..ee29662698a 100644 --- a/source/blender/blenlib/intern/mesh_intersect.cc +++ b/source/blender/blenlib/intern/mesh_intersect.cc @@ -829,13 +829,13 @@ struct BBPadData { static void pad_face_bb_range_func(void *__restrict userdata, const int iter, - const TaskParallelTLS *__restrict UNUSED(tls)) + const TaskParallelTLS *__restrict /*tls*/) { BBPadData *pad_data = static_cast<BBPadData *>(userdata); (*pad_data->face_bounding_box)[iter].expand(pad_data->pad); } -static void calc_face_bb_reduce(const void *__restrict UNUSED(userdata), +static void calc_face_bb_reduce(const void *__restrict /*userdata*/, void *__restrict chunk_join, void *__restrict chunk) { @@ -2451,7 +2451,7 @@ class TriOverlaps { } private: - static bool only_different_shapes(void *userdata, int index_a, int index_b, int UNUSED(thread)) + static bool only_different_shapes(void *userdata, int index_a, int index_b, int /*thread*/) { CBData *cbdata = static_cast<CBData *>(userdata); return cbdata->tm.face(index_a)->orig != cbdata->tm.face(index_b)->orig; @@ -2487,7 +2487,7 @@ static std::pair<int, int> canon_int_pair(int a, int b) static void calc_overlap_itts_range_func(void *__restrict userdata, const int iter, - const TaskParallelTLS *__restrict UNUSED(tls)) + const TaskParallelTLS *__restrict /*tls*/) { constexpr int dbg_level = 0; OverlapIttsData *data = static_cast<OverlapIttsData *>(userdata); @@ -2682,7 +2682,7 @@ static CDT_data calc_cluster_subdivided(const CoplanarClusterInfo &clinfo, const IMesh &tm, const TriOverlaps &ov, const Map<std::pair<int, int>, ITT_value> &itt_map, - IMeshArena *UNUSED(arena)) + IMeshArena * /*arena*/) { constexpr int dbg_level = 0; BLI_assert(c < clinfo.tot_cluster()); @@ -2889,7 +2889,7 @@ static void degenerate_range_func(void *__restrict userdata, chunk_data->has_degenerate_tri |= is_degenerate; } -static void degenerate_reduce(const void *__restrict UNUSED(userdata), +static void degenerate_reduce(const void *__restrict /*userdata*/, void *__restrict chunk_join, void *__restrict chunk) { @@ -2931,7 +2931,7 @@ static IMesh remove_degenerate_tris(const IMesh &tm_in) IMesh trimesh_self_intersect(const IMesh &tm_in, IMeshArena *arena) { return trimesh_nary_intersect( - tm_in, 1, [](int UNUSED(t)) { return 0; }, true, arena); + tm_in, 1, [](int /*t*/) { return 0; }, true, arena); } IMesh trimesh_nary_intersect(const IMesh &tm_in, diff --git a/source/blender/blenlib/intern/task_graph.cc b/source/blender/blenlib/intern/task_graph.cc index 6c1cc818d75..5bc84bf7573 100644 --- a/source/blender/blenlib/intern/task_graph.cc +++ b/source/blender/blenlib/intern/task_graph.cc @@ -75,7 +75,7 @@ struct TaskNode { } #ifdef WITH_TBB - tbb::flow::continue_msg run(const tbb::flow::continue_msg UNUSED(input)) + tbb::flow::continue_msg run(const tbb::flow::continue_msg /*input*/) { run_func(task_data); return tbb::flow::continue_msg(); diff --git a/source/blender/blenlib/intern/task_range.cc b/source/blender/blenlib/intern/task_range.cc index 181b760bea1..20551aba93b 100644 --- a/source/blender/blenlib/intern/task_range.cc +++ b/source/blender/blenlib/intern/task_range.cc @@ -132,7 +132,7 @@ void BLI_task_parallel_range(const int start, } } -int BLI_task_parallel_thread_id(const TaskParallelTLS *UNUSED(tls)) +int BLI_task_parallel_thread_id(const TaskParallelTLS * /*tls*/) { #ifdef WITH_TBB /* Get a unique thread ID for texture nodes. In the future we should get rid diff --git a/source/blender/blenlib/tests/BLI_cpp_type_test.cc b/source/blender/blenlib/tests/BLI_cpp_type_test.cc index 6a59bedc649..5823d54f51b 100644 --- a/source/blender/blenlib/tests/BLI_cpp_type_test.cc +++ b/source/blender/blenlib/tests/BLI_cpp_type_test.cc @@ -63,7 +63,7 @@ struct TestType { return stream; } - friend bool operator==(const TestType &UNUSED(a), const TestType &UNUSED(b)) + friend bool operator==(const TestType & /*a*/, const TestType & /*b*/) { return false; } diff --git a/source/blender/blenlib/tests/BLI_delaunay_2d_test.cc b/source/blender/blenlib/tests/BLI_delaunay_2d_test.cc index adcfe7f5d2d..ca99c678754 100644 --- a/source/blender/blenlib/tests/BLI_delaunay_2d_test.cc +++ b/source/blender/blenlib/tests/BLI_delaunay_2d_test.cc @@ -110,7 +110,7 @@ static int get_orig_index(const Array<Vector<int>> &out_to_orig, int orig_index) return -1; } -template<typename T> static double math_to_double(const T UNUSED(v)) +template<typename T> static double math_to_double(const T /*v*/) { BLI_assert(false); /* Need implementation for other type. */ return 0.0; diff --git a/source/blender/blenlib/tests/BLI_map_test.cc b/source/blender/blenlib/tests/BLI_map_test.cc index 0ca07309836..69ae82d6f05 100644 --- a/source/blender/blenlib/tests/BLI_map_test.cc +++ b/source/blender/blenlib/tests/BLI_map_test.cc @@ -560,8 +560,8 @@ TEST(map, PopExceptions) TEST(map, AddOrModifyExceptions) { Map<ExceptionThrower, ExceptionThrower> map; - auto create_fn = [](ExceptionThrower *UNUSED(v)) { throw std::runtime_error(""); }; - auto modify_fn = [](ExceptionThrower *UNUSED(v)) {}; + auto create_fn = [](ExceptionThrower * /*v*/) { throw std::runtime_error(""); }; + auto modify_fn = [](ExceptionThrower * /*v*/) {}; EXPECT_ANY_THROW({ map.add_or_modify(3, create_fn, modify_fn); }); } diff --git a/source/blender/blenlib/tests/BLI_memory_utils_test.cc b/source/blender/blenlib/tests/BLI_memory_utils_test.cc index ab716e5d011..939ac6151b0 100644 --- a/source/blender/blenlib/tests/BLI_memory_utils_test.cc +++ b/source/blender/blenlib/tests/BLI_memory_utils_test.cc @@ -20,7 +20,7 @@ struct MyValue { alive++; } - MyValue(const MyValue &UNUSED(other)) + MyValue(const MyValue & /*other*/) { if (alive == 15) { throw std::exception(); diff --git a/source/blender/blenlib/tests/BLI_mesh_boolean_test.cc b/source/blender/blenlib/tests/BLI_mesh_boolean_test.cc index fabc2412828..ea324534d78 100644 --- a/source/blender/blenlib/tests/BLI_mesh_boolean_test.cc +++ b/source/blender/blenlib/tests/BLI_mesh_boolean_test.cc @@ -106,7 +106,7 @@ class IMeshBuilder { } }; -static int all_shape_zero(int UNUSED(t)) +static int all_shape_zero(int /*t*/) { return 0; } diff --git a/source/blender/blenlib/tests/BLI_task_test.cc b/source/blender/blenlib/tests/BLI_task_test.cc index a933d45e7cd..63bb767466f 100644 --- a/source/blender/blenlib/tests/BLI_task_test.cc +++ b/source/blender/blenlib/tests/BLI_task_test.cc @@ -27,7 +27,7 @@ static void task_range_iter_func(void *userdata, int index, const TaskParallelTL // printf("%d, %d, %d\n", index, data[index], *((int *)tls->userdata_chunk)); } -static void task_range_iter_reduce_func(const void *__restrict UNUSED(userdata), +static void task_range_iter_reduce_func(const void *__restrict /*userdata*/, void *__restrict join_v, void *__restrict userdata_chunk) { @@ -71,7 +71,7 @@ TEST(task, RangeIter) static void task_mempool_iter_func(void *userdata, MempoolIterData *item, - const TaskParallelTLS *__restrict UNUSED(tls)) + const TaskParallelTLS *__restrict /*tls*/) { int *data = (int *)item; int *count = (int *)userdata; @@ -147,7 +147,7 @@ using TaskMemPool_Chunk = struct TaskMemPool_Chunk { ListBase *accumulate_items; }; -static void task_mempool_iter_tls_func(void *UNUSED(userdata), +static void task_mempool_iter_tls_func(void * /*userdata*/, MempoolIterData *item, const TaskParallelTLS *__restrict tls) { @@ -165,7 +165,7 @@ static void task_mempool_iter_tls_func(void *UNUSED(userdata), BLI_addtail(task_data->accumulate_items, BLI_genericNodeN(data)); } -static void task_mempool_iter_tls_reduce(const void *__restrict UNUSED(userdata), +static void task_mempool_iter_tls_reduce(const void *__restrict /*userdata*/, void *__restrict chunk_join, void *__restrict chunk) { @@ -180,8 +180,7 @@ static void task_mempool_iter_tls_reduce(const void *__restrict UNUSED(userdata) } } -static void task_mempool_iter_tls_free(const void *UNUSED(userdata), - void *__restrict userdata_chunk) +static void task_mempool_iter_tls_free(const void * /*userdata*/, void *__restrict userdata_chunk) { TaskMemPool_Chunk *task_data = (TaskMemPool_Chunk *)userdata_chunk; MEM_freeN(task_data->accumulate_items); @@ -240,7 +239,7 @@ TEST(task, MempoolIterTLS) static void task_listbase_iter_func(void *userdata, void *item, int index, - const TaskParallelTLS *__restrict UNUSED(tls)) + const TaskParallelTLS *__restrict /*tls*/) { LinkData *data = (LinkData *)item; int *count = (int *)userdata; diff --git a/source/blender/blenlib/tests/BLI_vector_test.cc b/source/blender/blenlib/tests/BLI_vector_test.cc index c603f5dff27..29bf6c0cfb1 100644 --- a/source/blender/blenlib/tests/BLI_vector_test.cc +++ b/source/blender/blenlib/tests/BLI_vector_test.cc @@ -506,11 +506,11 @@ class TypeConstructMock { { } - TypeConstructMock(const TypeConstructMock &UNUSED(other)) : copy_constructed(true) + TypeConstructMock(const TypeConstructMock & /*other*/) : copy_constructed(true) { } - TypeConstructMock(TypeConstructMock &&UNUSED(other)) noexcept : move_constructed(true) + TypeConstructMock(TypeConstructMock && /*other*/) noexcept : move_constructed(true) { } diff --git a/source/blender/blenlib/tests/performance/BLI_task_performance_test.cc b/source/blender/blenlib/tests/performance/BLI_task_performance_test.cc index adebb1edb8b..68fdf4031ab 100644 --- a/source/blender/blenlib/tests/performance/BLI_task_performance_test.cc +++ b/source/blender/blenlib/tests/performance/BLI_task_performance_test.cc @@ -36,10 +36,10 @@ static uint gen_pseudo_random_number(uint num) /* *** Parallel iterations over double-linked list items. *** */ -static void task_listbase_light_iter_func(void *UNUSED(userdata), +static void task_listbase_light_iter_func(void * /*userdata*/, void *item, int index, - const TaskParallelTLS *__restrict UNUSED(tls)) + const TaskParallelTLS *__restrict /*tls*/) { LinkData *data = (LinkData *)item; @@ -50,7 +50,7 @@ static void task_listbase_light_iter_func(void *UNUSED(userdata), static void task_listbase_light_membarrier_iter_func(void *userdata, void *item, int index, - const TaskParallelTLS *__restrict UNUSED(tls)) + const TaskParallelTLS *__restrict /*tls*/) { LinkData *data = (LinkData *)item; @@ -60,10 +60,10 @@ static void task_listbase_light_membarrier_iter_func(void *userdata, atomic_sub_and_fetch_uint32((uint32_t *)count, 1); } -static void task_listbase_heavy_iter_func(void *UNUSED(userdata), +static void task_listbase_heavy_iter_func(void * /*userdata*/, void *item, int index, - const TaskParallelTLS *__restrict UNUSED(tls)) + const TaskParallelTLS *__restrict /*tls*/) { LinkData *data = (LinkData *)item; @@ -79,7 +79,7 @@ static void task_listbase_heavy_iter_func(void *UNUSED(userdata), static void task_listbase_heavy_membarrier_iter_func(void *userdata, void *item, int index, - const TaskParallelTLS *__restrict UNUSED(tls)) + const TaskParallelTLS *__restrict /*tls*/) { LinkData *data = (LinkData *)item; |