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/BLI_virtual_array.hh | |
parent | c5f55d17096d373791363e46004176e3f7f7ae52 (diff) | |
parent | 0b4bd3ddc016298e868169a541cf6c132b10c587 (diff) |
Merge branch 'master' into asset-browser-grid-viewasset-browser-grid-view
Diffstat (limited to 'source/blender/blenlib/BLI_virtual_array.hh')
-rw-r--r-- | source/blender/blenlib/BLI_virtual_array.hh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenlib/BLI_virtual_array.hh b/source/blender/blenlib/BLI_virtual_array.hh index 19ee2334bd9..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; } @@ -324,7 +324,7 @@ class VArrayImpl_For_ArrayContainer : public VArrayImpl_For_Span<T> { public: VArrayImpl_For_ArrayContainer(Container container) - : VArrayImpl_For_Span<T>((int64_t)container.size()), container_(std::move(container)) + : VArrayImpl_For_Span<T>(int64_t(container.size())), container_(std::move(container)) { this->data_ = const_cast<T *>(container_.data()); } @@ -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_; } |