Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2021-10-31 16:28:01 +0300
committerJacques Lucke <jacques@blender.org>2021-10-31 16:28:01 +0300
commite1c1c65578adc0ba0900926dfe0758930bc878fe (patch)
tree5ab99ab3a5ac1f3b20ae011980ff6aaff79e8e4b
parent2154631e852dcbbbc56b00961b431242f4a93acb (diff)
-rw-r--r--source/blender/blenlib/BLI_virtual_array.hh20
-rw-r--r--source/blender/functions/intern/generic_virtual_array.cc17
2 files changed, 8 insertions, 29 deletions
diff --git a/source/blender/blenlib/BLI_virtual_array.hh b/source/blender/blenlib/BLI_virtual_array.hh
index e94fed7ef24..d9f83d3e1cb 100644
--- a/source/blender/blenlib/BLI_virtual_array.hh
+++ b/source/blender/blenlib/BLI_virtual_array.hh
@@ -810,14 +810,8 @@ template<typename T> class VArray : public VArrayCommon<T> {
public:
VArray() = default;
-
- VArray(const VArray &other) : VArrayCommon<T>(other)
- {
- }
-
- VArray(VArray &&other) noexcept : VArrayCommon<T>(std::move(other))
- {
- }
+ VArray(const VArray &other) = default;
+ VArray(VArray &&other) noexcept = default;
VArray(const VArrayImpl<T> *impl) : VArrayCommon<T>(impl)
{
@@ -903,14 +897,8 @@ template<typename T> class VArray : public VArrayCommon<T> {
template<typename T> class VMutableArray : public VArrayCommon<T> {
public:
VMutableArray() = default;
-
- VMutableArray(const VMutableArray &other) : VArrayCommon<T>(other)
- {
- }
-
- VMutableArray(VMutableArray &&other) noexcept : VArrayCommon<T>(std::move(other))
- {
- }
+ VMutableArray(const VMutableArray &other) = default;
+ VMutableArray(VMutableArray &&other) noexcept = default;
VMutableArray(const VMutableArrayImpl<T> *impl) : VArrayCommon<T>(impl)
{
diff --git a/source/blender/functions/intern/generic_virtual_array.cc b/source/blender/functions/intern/generic_virtual_array.cc
index feaf7dccd9b..5d20fb1b73b 100644
--- a/source/blender/functions/intern/generic_virtual_array.cc
+++ b/source/blender/functions/intern/generic_virtual_array.cc
@@ -591,13 +591,9 @@ IndexRange GVArrayCommon::index_range() const
/** \name #GVArray
* \{ */
-GVArray::GVArray(const GVArray &other) : GVArrayCommon(other)
-{
-}
+GVArray::GVArray(const GVArray &other) = default;
-GVArray::GVArray(GVArray &&other) noexcept : GVArrayCommon(std::move(other))
-{
-}
+GVArray::GVArray(GVArray &&other) noexcept = default;
GVArray::GVArray(const GVArrayImpl *impl) : GVArrayCommon(impl)
{
@@ -671,13 +667,8 @@ GVArray &GVArray::operator=(GVArray &&other) noexcept
/** \name #GVMutableArray
* \{ */
-GVMutableArray::GVMutableArray(const GVMutableArray &other) : GVArrayCommon(other)
-{
-}
-
-GVMutableArray::GVMutableArray(GVMutableArray &&other) noexcept : GVArrayCommon(std::move(other))
-{
-}
+GVMutableArray::GVMutableArray(const GVMutableArray &other) = default;
+GVMutableArray::GVMutableArray(GVMutableArray &&other) noexcept = default;
GVMutableArray::GVMutableArray(GVMutableArrayImpl *impl) : GVArrayCommon(impl)
{