oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

util/AllocatedArray: add ConstBuffer copy constructor

Browse Source
This commit is contained in:
Max Kellermann 2019-12-09 09:41:50 +01:00 committed by Max Kellermann
parent 908b6a1939
commit a93b7172aa
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/util/AllocatedArray.hxx
View File

@ -61,16 +61,17 @@ public:
explicit AllocatedArray(size_type _size) noexcept
:buffer{new T[_size], _size} {}
explicit AllocatedArray(const AllocatedArray &other) noexcept {
assert(other.size() == 0 || other.buffer.data != nullptr);
if (other == nullptr)
explicit AllocatedArray(ConstBuffer<T> src) noexcept {
if (src == nullptr)
return;
buffer = {new T[other.buffer.size], other.buffer.size};
std::copy_n(other.buffer.data, buffer.size, buffer.data);
buffer = {new T[src.size], src.size};
std::copy_n(src.data, src.size, buffer.data);
}
explicit AllocatedArray(const AllocatedArray &other) noexcept
:AllocatedArray(other.buffer) {}
AllocatedArray(AllocatedArray &&other) noexcept
:buffer(std::exchange(other.buffer, nullptr)) {}
@ -78,6 +79,15 @@ public:
delete[] buffer.data;
}
AllocatedArray &operator=(ConstBuffer<T> src) noexcept {
assert(size() == 0 || buffer.data != nullptr);
assert(src.size == 0 || src.data != nullptr);
ResizeDiscard(src.size);
std::copy_n(src.data, src.size, buffer.data);
return *this;
}
AllocatedArray &operator=(const AllocatedArray &other) noexcept {
assert(size() == 0 || buffer.data != nullptr);
assert(other.size() == 0 || other.buffer.data != nullptr);