diff options
| author | Julian Eisel <julian@blender.org> | 2022-11-10 15:17:42 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2022-11-10 15:17:42 +0300 |
| commit | 7246c387435769a169ac24c91434c615df6434b4 (patch) | |
| tree | 61842e3e0ce85e80720fdd7476d44d2e629f59fd /source/blender/blenlib/intern/generic_virtual_array.cc | |
| parent | c5f55d17096d373791363e46004176e3f7f7ae52 (diff) | |
| parent | 0b4bd3ddc016298e868169a541cf6c132b10c587 (diff) | |
Merge branch 'master' into asset-browser-grid-viewasset-browser-grid-view
Diffstat (limited to 'source/blender/blenlib/intern/generic_virtual_array.cc')
| -rw-r--r-- | source/blender/blenlib/intern/generic_virtual_array.cc | 12 |
1 files changed, 6 insertions, 6 deletions
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); } |