diff options
author | Jacques Lucke <jacques@blender.org> | 2021-10-30 22:07:33 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2021-10-30 22:07:33 +0300 |
commit | 1d7a893d127b573133bdd8d4d9745899fc69ae3e (patch) | |
tree | 5f9cf6d676eb0b6eba2b7bce5350f56dfdf35218 | |
parent | 5e60ba93f78f31911472e7a6697bee66f531bdce (diff) |
cleanup
-rw-r--r-- | source/blender/blenlib/BLI_virtual_array.hh | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/blenlib/BLI_virtual_array.hh b/source/blender/blenlib/BLI_virtual_array.hh index 62bb95630df..20f36ba7664 100644 --- a/source/blender/blenlib/BLI_virtual_array.hh +++ b/source/blender/blenlib/BLI_virtual_array.hh @@ -468,6 +468,8 @@ template<typename T> struct VArrayAnyExtraInfo { } }; +} // namespace detail + template<typename T> class VArrayCommon { protected: using ExtraInfo = detail::VArrayAnyExtraInfo<T>; @@ -658,29 +660,27 @@ template<typename T> class VArrayCommon { } }; -} // namespace detail - template<typename T> class VMutableArray; -template<typename T> class VArray : public detail::VArrayCommon<T> { +template<typename T> class VArray : public VArrayCommon<T> { friend VMutableArray<T>; public: VArray() = default; - VArray(const VArray &other) : detail::VArrayCommon<T>(other) + VArray(const VArray &other) : VArrayCommon<T>(other) { } - VArray(VArray &&other) : detail::VArrayCommon<T>(std::move(other)) + VArray(VArray &&other) : VArrayCommon<T>(std::move(other)) { } - VArray(const VArrayImpl<T> *impl) : detail::VArrayCommon<T>(impl) + VArray(const VArrayImpl<T> *impl) : VArrayCommon<T>(impl) { } - VArray(std::shared_ptr<const VArrayImpl<T>> impl) : detail::VArrayCommon<T>(std::move(impl)) + VArray(std::shared_ptr<const VArrayImpl<T>> impl) : VArrayCommon<T>(std::move(impl)) { } @@ -731,24 +731,24 @@ template<typename T> class VArray : public detail::VArrayCommon<T> { } }; -template<typename T> class VMutableArray : public detail::VArrayCommon<T> { +template<typename T> class VMutableArray : public VArrayCommon<T> { public: VMutableArray() = default; - VMutableArray(const VMutableArray &other) : detail::VArrayCommon<T>(other) + VMutableArray(const VMutableArray &other) : VArrayCommon<T>(other) { } - VMutableArray(VMutableArray &&other) : detail::VArrayCommon<T>(std::move(other)) + VMutableArray(VMutableArray &&other) : VArrayCommon<T>(std::move(other)) { } - VMutableArray(const VMutableArrayImpl<T> *impl) : detail::VArrayCommon<T>(impl) + VMutableArray(const VMutableArrayImpl<T> *impl) : VArrayCommon<T>(impl) { } VMutableArray(std::shared_ptr<const VMutableArrayImpl<T>> impl) - : detail::VArrayCommon<T>(std::move(impl)) + : VArrayCommon<T>(std::move(impl)) { } |