[Bf-blender-cvs] [c55061f539b] temp-cpp-type-cleanup: remove more duplication

[Jacques Lucke]

Commit: c55061f539b5166709d30e50e3c2b57874f65a65
Author: Jacques Lucke
Date:   Sun Jun 27 14:10:04 2021 +0200
Branches: temp-cpp-type-cleanup
https://developer.blender.org/rBc55061f539b5166709d30e50e3c2b57874f65a65

remove more duplication

===================================================================

M	source/blender/functions/FN_cpp_type.hh
M	source/blender/functions/FN_cpp_type_make.hh

===================================================================

diff --git a/source/blender/functions/FN_cpp_type.hh b/source/blender/functions/FN_cpp_type.hh
index 0c1d349bb4f..a8cc8494585 100644
--- a/source/blender/functions/FN_cpp_type.hh
+++ b/source/blender/functions/FN_cpp_type.hh
@@ -80,35 +80,27 @@ struct CPPTypeMembers {
   bool is_trivially_destructible = 0;
 
   void (*construct_default)(void *ptr) = nullptr;
-  void (*construct_default_n)(void *ptr, int64_t n) = nullptr;
   void (*construct_default_indices)(void *ptr, IndexMask mask) = nullptr;
 
   void (*destruct)(void *ptr) = nullptr;
-  void (*destruct_n)(void *ptr, int64_t n) = nullptr;
   void (*destruct_indices)(void *ptr, IndexMask mask) = nullptr;
 
   void (*copy_to_initialized)(const void *src, void *dst) = nullptr;
-  void (*copy_to_initialized_n)(const void *src, void *dst, int64_t n) = nullptr;
   void (*copy_to_initialized_indices)(const void *src, void *dst, IndexMask mask) = nullptr;
 
   void (*copy_to_uninitialized)(const void *src, void *dst) = nullptr;
-  void (*copy_to_uninitialized_n)(const void *src, void *dst, int64_t n) = nullptr;
   void (*copy_to_uninitialized_indices)(const void *src, void *dst, IndexMask mask) = nullptr;
 
   void (*move_to_initialized)(void *src, void *dst) = nullptr;
-  void (*move_to_initialized_n)(void *src, void *dst, int64_t n) = nullptr;
   void (*move_to_initialized_indices)(void *src, void *dst, IndexMask mask) = nullptr;
 
   void (*move_to_uninitialized)(void *src, void *dst) = nullptr;
-  void (*move_to_uninitialized_n)(void *src, void *dst, int64_t n) = nullptr;
   void (*move_to_uninitialized_indices)(void *src, void *dst, IndexMask mask) = nullptr;
 
   void (*relocate_to_initialized)(void *src, void *dst) = nullptr;
-  void (*relocate_to_initialized_n)(void *src, void *dst, int64_t n) = nullptr;
   void (*relocate_to_initialized_indices)(void *src, void *dst, IndexMask mask) = nullptr;
 
   void (*relocate_to_uninitialized)(void *src, void *dst) = nullptr;
-  void (*relocate_to_uninitialized_n)(void *src, void *dst, int64_t n) = nullptr;
   void (*relocate_to_uninitialized_indices)(void *src, void *dst, IndexMask mask) = nullptr;
 
   void (*fill_initialized)(const void *value, void *dst, int64_t n) = nullptr;
@@ -230,9 +222,7 @@ class CPPType : NonCopyable, NonMovable {
 
   void construct_default_n(void *ptr, int64_t n) const
   {
-    BLI_assert(n == 0 || this->pointer_can_point_to_instance(ptr));
-
-    m_.construct_default_n(ptr, n);
+    this->construct_default_indices(ptr, IndexMask(n));
   }
 
   void construct_default_indices(void *ptr, IndexMask mask) const
@@ -259,9 +249,7 @@ class CPPType : NonCopyable, NonMovable {
 
   void destruct_n(void *ptr, int64_t n) const
   {
-    BLI_assert(n == 0 || this->pointer_can_point_to_instance(ptr));
-
-    m_.destruct_n(ptr, n);
+    this->destruct_indices(ptr, IndexMask(n));
   }
 
   void destruct_indices(void *ptr, IndexMask mask) const
@@ -288,11 +276,7 @@ class CPPType : NonCopyable, NonMovable {
 
   void copy_to_initialized_n(const void *src, void *dst, int64_t n) const
   {
-    BLI_assert(n == 0 || src != dst);
-    BLI_assert(n == 0 || this->pointer_can_point_to_instance(src));
-    BLI_assert(n == 0 || this->pointer_can_point_to_instance(dst));
-
-    m_.copy_to_initialized_n(src, dst, n);
+    this->copy_to_initialized_indices(src, dst, IndexMask(n));
   }
 
   void copy_to_initialized_indices(const void *src, void *dst, IndexMask mask) const
@@ -323,11 +307,7 @@ class CPPType : NonCopyable, NonMovable {
 
   void copy_to_uninitialized_n(const void *src, void *dst, int64_t n) const
   {
-    BLI_assert(n == 0 || src != dst);
-    BLI_assert(n == 0 || this->pointer_can_point_to_instance(src));
-    BLI_assert(n == 0 || this->pointer_can_point_to_instance(dst));
-
-    m_.copy_to_uninitialized_n(src, dst, n);
+    this->copy_to_uninitialized_indices(src, dst, IndexMask(n));
   }
 
   void copy_to_uninitialized_indices(const void *src, void *dst, IndexMask mask) const
@@ -358,11 +338,7 @@ class CPPType : NonCopyable, NonMovable {
 
   void move_to_initialized_n(void *src, void *dst, int64_t n) const
   {
-    BLI_assert(n == 0 || src != dst);
-    BLI_assert(n == 0 || this->pointer_can_point_to_instance(src));
-    BLI_assert(n == 0 || this->pointer_can_point_to_instance(dst));
-
-    m_.move_to_initialized_n(src, dst, n);
+    this->move_to_initialized_indices(src, dst, IndexMask(n));
   }
 
   void move_to_initialized_indices(void *src, void *dst, IndexMask mask) const
@@ -393,11 +369,7 @@ class CPPType : NonCopyable, NonMovable {
 
   void move_to_uninitialized_n(void *src, void *dst, int64_t n) const
   {
-    BLI_assert(n == 0 || src != dst);
-    BLI_assert(n == 0 || this->pointer_can_point_to_instance(src));
-    BLI_assert(n == 0 || this->pointer_can_point_to_instance(dst));
-
-    m_.move_to_uninitialized_n(src, dst, n);
+    this->move_to_uninitialized_indices(src, dst, IndexMask(n));
   }
 
   void move_to_uninitialized_indices(void *src, void *dst, IndexMask mask) const
@@ -428,11 +400,7 @@ class CPPType : NonCopyable, NonMovable {
 
   void relocate_to_initialized_n(void *src, void *dst, int64_t n) const
   {
-    BLI_assert(n == 0 || src != dst);
-    BLI_assert(n == 0 || this->pointer_can_point_to_instance(src));
-    BLI_assert(n == 0 || this->pointer_can_point_to_instance(dst));
-
-    m_.relocate_to_initialized_n(src, dst, n);
+    this->relocate_to_initialized_indices(src, dst, IndexMask(n));
   }
 
   void relocate_to_initialized_indices(void *src, void *dst, IndexMask mask) const
@@ -463,11 +431,7 @@ class CPPType : NonCopyable, NonMovable {
 
   void relocate_to_uninitialized_n(void *src, void *dst, int64_t n) const
   {
-    BLI_assert(n == 0 || src != dst);
-    BLI_assert(n == 0 || this->pointer_can_point_to_instance(src));
-    BLI_assert(n == 0 || this->pointer_can_point_to_instance(dst));
-
-    m_.relocate_to_uninitialized_n(src, dst, n);
+    this->relocate_to_uninitialized_indices(src, dst, IndexMask(n));
   }
 
   void relocate_to_uninitialized_indices(void *src, void *dst, IndexMask mask) const
diff --git a/source/blender/functions/FN_cpp_type_make.hh b/source/blender/functions/FN_cpp_type_make.hh
index e2307d2f9f1..8022e5b8145 100644
--- a/source/blender/functions/FN_cpp_type_make.hh
+++ b/source/blender/functions/FN_cpp_type_make.hh
@@ -28,10 +28,6 @@ template<typename T> void construct_default_cb(void *ptr)
 {
   new (ptr) T;
 }
-template<typename T> void construct_default_n_cb(void *ptr, int64_t n)
-{
-  blender::default_construct_n(static_cast<T *>(ptr), n);
-}
 template<typename T> void construct_default_indices_cb(void *ptr, IndexMask mask)
 {
   mask.foreach_index([&](int64_t i) { new (static_cast<T *>(ptr) + i) T; });
@@ -41,10 +37,6 @@ template<typename T> void destruct_cb(void *ptr)
 {
   (static_cast<T *>(ptr))->~T();
 }
-template<typename T> void destruct_n_cb(void *ptr, int64_t n)
-{
-  blender::destruct_n(static_cast<T *>(ptr), n);
-}
 template<typename T> void destruct_indices_cb(void *ptr, IndexMask mask)
 {
   T *ptr_ = static_cast<T *>(ptr);
@@ -55,15 +47,6 @@ template<typename T> void copy_to_initialized_cb(const void *src, void *dst)
 {
   *static_cast<T *>(dst) = *static_cast<const T *>(src);
 }
-template<typename T> void copy_to_initialized_n_cb(const void *src, void *dst, int64_t n)
-{
-  const T *src_ = static_cast<const T *>(src);
-  T *dst_ = static_cast<T *>(dst);
-
-  for (int64_t i = 0; i < n; i++) {
-    dst_[i] = src_[i];
-  }
-}
 template<typename T>
 void copy_to_initialized_indices_cb(const void *src, void *dst, IndexMask mask)
 {
@@ -77,10 +60,6 @@ template<typename T> void copy_to_uninitialized_cb(const void *src, void *dst)
 {
   blender::uninitialized_copy_n(static_cast<const T *>(src), 1, static_cast<T *>(dst));
 }
-template<typename T> void copy_to_uninitialized_n_cb(const void *src, void *dst, int64_t n)
-{
-  blender::uninitialized_copy_n(static_cast<const T *>(src), n, static_cast<T *>(dst));
-}
 template<typename T>
 void copy_to_uninitialized_indices_cb(const void *src, void *dst, IndexMask mask)
 {
@@ -94,10 +73,6 @@ template<typename T> void move_to_initialized_cb(void *src, void *dst)
 {
   blender::initialized_move_n(static_cast<T *>(src), 1, static_cast<T *>(dst));
 }
-template<typename T> void move_to_initialized_n_cb(void *src, void *dst, int64_t n)
-{
-  blender::initialized_move_n(static_cast<T *>(src), n, static_cast<T *>(dst));
-}
 template<typename T> void move_to_initialized_indices_cb(void *src, void *dst, IndexMask mask)
 {
   T *src_ = static_cast<T *>(src);
@@ -110,10 +85,6 @@ template<typename T> void move_to_uninitialized_cb(void *src, void *dst)
 {
   blender::uninitialized_move_n(static_cast<T *>(src), 1, static_cast<T *>(dst));
 }
-template<typename T> void move_to_uninitialized_n_cb(void *src, void *dst, int64_t n)
-{
-  blender::uninitialized_move_n(static_cast<T *>(src), n, static_cast<T *>(dst));
-}
 template<typename T> void move_to_uninitialized_indices_cb(void *src, void *dst, IndexMask mask)
 {
   T *src_ = static_cast<T *>(src);
@@ -130,10 +101,6 @@ template<typename T> void relocate_to_initialized_cb(void *src, void *dst)
   *dst_ = std::move(*src_);
   src_->~T();
 }
-template<typename T> void relocate_to_initialized_n_cb(void *src, void *dst, int64_t n)
-{
-  blender::initialized_relocate_n(static_cast<T *>(src), n, static_cast<T *>(dst));
-}
 template<typename T> void relocate_to_initialized_indices_cb(void *src, void *dst, IndexMask mask)
 {
   T *src_ = static_cast<T *>(src);
@@ -153,10 +120,6 @@ template<typename T> void relocate_to_uninitialized_cb(void *src, void *dst)
   new (dst_) T(std::move(*src_));
   src_->~T();
 }
-template<typename T> void relocate_to_uninitialized_n_cb(void *src, void *dst, int64_t n)
-{
-  blender::uninitialized_relocate_n(static_cast<T *>(src), n, static_cast<T *>(dst));
-}
 template<typename T>
 void relocate_to_uninitialized_indices_cb(void *src, void *dst, IndexMask mask)
 {
@@ -237,28 +200,20 @@ inline std::unique_ptr<const CPPType> create_cpp_type(StringRef name, const T &d
   m.alignment = (int64_t)alignof(T);
   m.is_trivially_destructible = std::is_trivially_destructible_v<T>;
   m.construct_default = construct_default_cb<T>;
-  m.construct_default_n = construct_default_n_

@@ Diff output truncated at 10240 characters. @@