kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

BLI: simplify copy constructor of Array

Browse Source
This commit is contained in:
Jacques Lucke 2020-07-07 20:32:40 +02:00
parent eb5fb1741d
commit afcb41a0aa
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenlib/BLI_array.hh
View File

@ -89,7 +89,7 @@ class Array {
/** /**
* Create a new array that contains copies of all values. * Create a new array that contains copies of all values.
*/ */
Array(Span<T> values) Array(Span<T> values, Allocator allocator = {}) : allocator_(allocator)
{ {
size_ = values.size(); size_ = values.size();
data_ = this->get_buffer_for_size(values.size()); data_ = this->get_buffer_for_size(values.size());
@ -147,12 +147,8 @@ class Array {
data_ = this->get_buffer_for_size(size); data_ = this->get_buffer_for_size(size);
} }
Array(const Array &other) : allocator_(other.allocator_) Array(const Array &other) : Array(other.as_span(), other.allocator_)
{ {
size_ = other.size();
data_ = this->get_buffer_for_size(other.size());
uninitialized_copy_n(other.data(), size_, data_);
} }
Array(Array &&other) noexcept : allocator_(other.allocator_) Array(Array &&other) noexcept : allocator_(other.allocator_)