diff options
author | Hans Goudey <h.goudey@me.com> | 2022-10-04 01:37:25 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2022-10-04 01:38:16 +0300 |
commit | 97746129d5870beedc40e3c035c7982ce8a6bebc (patch) | |
tree | b819b8e7875e6684aad7ea1f6bb7922d4fa1c8fc /source/blender/functions/intern | |
parent | ed7f5713f8f9d605e3cd4cce42e40fb5c6bf4bf5 (diff) |
Cleanup: replace UNUSED macro with commented args in C++ code
This is the conventional way of dealing with unused arguments in C++,
since it works on all compilers.
Regex find and replace: `UNUSED\((\w+)\)` -> `/*$1*/`
Diffstat (limited to 'source/blender/functions/intern')
4 files changed, 10 insertions, 12 deletions
diff --git a/source/blender/functions/intern/field.cc b/source/blender/functions/intern/field.cc index dca12859b72..d2205864945 100644 --- a/source/blender/functions/intern/field.cc +++ b/source/blender/functions/intern/field.cc @@ -552,9 +552,9 @@ GVArray IndexFieldInput::get_index_varray(IndexMask mask) return VArray<int>::ForFunc(mask.min_array_size(), index_func); } -GVArray IndexFieldInput::get_varray_for_context(const fn::FieldContext &UNUSED(context), +GVArray IndexFieldInput::get_varray_for_context(const fn::FieldContext & /*context*/, IndexMask mask, - ResourceScope &UNUSED(scope)) const + ResourceScope & /*scope*/) const { /* TODO: Investigate a similar method to IndexRange::as_span() */ return get_index_varray(mask); @@ -743,7 +743,7 @@ int FieldEvaluator::add(GField field, GVArray *varray_ptr) const int field_index = fields_to_evaluate_.append_and_get_index(std::move(field)); dst_varrays_.append(nullptr); output_pointer_infos_.append(OutputPointerInfo{ - varray_ptr, [](void *dst, const GVArray &varray, ResourceScope &UNUSED(scope)) { + varray_ptr, [](void *dst, const GVArray &varray, ResourceScope & /*scope*/) { *static_cast<GVArray *>(dst) = varray; }}); return field_index; diff --git a/source/blender/functions/intern/lazy_function.cc b/source/blender/functions/intern/lazy_function.cc index 2d69af84f85..f1c53a04b3f 100644 --- a/source/blender/functions/intern/lazy_function.cc +++ b/source/blender/functions/intern/lazy_function.cc @@ -25,7 +25,7 @@ std::string LazyFunction::output_name(int index) const return outputs_[index].debug_name; } -void *LazyFunction::init_storage(LinearAllocator<> &UNUSED(allocator)) const +void *LazyFunction::init_storage(LinearAllocator<> & /*allocator*/) const { return nullptr; } diff --git a/source/blender/functions/intern/multi_function_builder.cc b/source/blender/functions/intern/multi_function_builder.cc index 8a09ed37e19..32a41f99c48 100644 --- a/source/blender/functions/intern/multi_function_builder.cc +++ b/source/blender/functions/intern/multi_function_builder.cc @@ -32,9 +32,7 @@ CustomMF_GenericConstant::~CustomMF_GenericConstant() } } -void CustomMF_GenericConstant::call(IndexMask mask, - MFParams params, - MFContext UNUSED(context)) const +void CustomMF_GenericConstant::call(IndexMask mask, MFParams params, MFContext /*context*/) const { GMutableSpan output = params.uninitialized_single_output(0); type_.fill_construct_indices(value_, output.data(), mask); @@ -68,7 +66,7 @@ CustomMF_GenericConstantArray::CustomMF_GenericConstantArray(GSpan array) : arra void CustomMF_GenericConstantArray::call(IndexMask mask, MFParams params, - MFContext UNUSED(context)) const + MFContext /*context*/) const { GVectorArray &vectors = params.vector_output(0); for (int64_t i : mask) { @@ -90,7 +88,7 @@ CustomMF_DefaultOutput::CustomMF_DefaultOutput(Span<MFDataType> input_types, signature_ = signature.build(); this->set_signature(&signature_); } -void CustomMF_DefaultOutput::call(IndexMask mask, MFParams params, MFContext UNUSED(context)) const +void CustomMF_DefaultOutput::call(IndexMask mask, MFParams params, MFContext /*context*/) const { for (int param_index : this->param_indices()) { MFParamType param_type = this->param_type(param_index); @@ -115,7 +113,7 @@ CustomMF_GenericCopy::CustomMF_GenericCopy(MFDataType data_type) this->set_signature(&signature_); } -void CustomMF_GenericCopy::call(IndexMask mask, MFParams params, MFContext UNUSED(context)) const +void CustomMF_GenericCopy::call(IndexMask mask, MFParams params, MFContext /*context*/) const { const MFDataType data_type = this->param_type(0).data_type(); switch (data_type.category()) { diff --git a/source/blender/functions/intern/multi_function_procedure.cc b/source/blender/functions/intern/multi_function_procedure.cc index 7ad324a9574..b78787de57c 100644 --- a/source/blender/functions/intern/multi_function_procedure.cc +++ b/source/blender/functions/intern/multi_function_procedure.cc @@ -801,12 +801,12 @@ class MFProcedureDotExport { variable_to_string(instruction.variable(), ss); } - void instruction_to_string(const MFDummyInstruction &UNUSED(instruction), std::stringstream &ss) + void instruction_to_string(const MFDummyInstruction & /*instruction*/, std::stringstream &ss) { instruction_name_format("Dummy ", ss); } - void instruction_to_string(const MFReturnInstruction &UNUSED(instruction), std::stringstream &ss) + void instruction_to_string(const MFReturnInstruction & /*instruction*/, std::stringstream &ss) { instruction_name_format("Return ", ss); |