From 288076ed02c7735cef394d10e923a246ef9a769c Mon Sep 17 00:00:00 2001 From: Brett Date: Sun, 5 Nov 2023 19:05:32 -0500 Subject: [PATCH] improve scoped_buffer, it now handles copying --- include/blt/std/memory.h | 63 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 57 insertions(+), 6 deletions(-) diff --git a/include/blt/std/memory.h b/include/blt/std/memory.h index 33241ec..2a669f6 100755 --- a/include/blt/std/memory.h +++ b/include/blt/std/memory.h @@ -28,7 +28,7 @@ #if __cplusplus >= 202002L #include - + #define ENDIAN_LOOKUP(little_endian) (std::endian::native == std::endian::little && !little_endian) || \ (std::endian::native == std::endian::big && little_endian) #else @@ -167,8 +167,8 @@ namespace blt * The operator * has been overloaded to return the internal buffer. * @tparam T type that is stored in buffer eg char */ - template - struct scoped_buffer + template || std::is_copy_assignable_v> + class scoped_buffer { private: T* _buffer; @@ -182,7 +182,50 @@ namespace blt _buffer = new T[size]; } - scoped_buffer(const scoped_buffer& copy) = delete; + scoped_buffer(const scoped_buffer& copy) + { + _buffer = new T[copy.size()]; + _size = copy._size; + + if constexpr (std::is_trivially_copyable_v) + { + std::memcpy(_buffer, copy._buffer, copy.size()); + } else + { + if constexpr (std::is_copy_constructible_v && !std::is_copy_assignable_v) + { + for (size_t i = 0; i < this->_size; i++) + _buffer[i] = T(copy[i]); + } else + for (size_t i = 0; i < this->_size; i++) + _buffer[i] = copy[i]; + } + } + + scoped_buffer& operator=(const scoped_buffer& copy) + { + if (© == this) + return *this; + + delete[] this->_buffer; + _buffer = new T[copy.size()]; + _size = copy._size; + + if constexpr (std::is_trivially_copyable_v) + { + std::memcpy(_buffer, copy._buffer, copy.size()); + } else + { + if constexpr (std::is_copy_constructible_v && !std::is_copy_assignable_v) + { + for (size_t i = 0; i < this->_size; i++) + _buffer[i] = T(copy[i]); + } else + for (size_t i = 0; i < this->_size; i++) + _buffer[i] = copy[i]; + } + return *this; + } scoped_buffer(scoped_buffer&& move) noexcept { @@ -192,8 +235,6 @@ namespace blt move._buffer = nullptr; } - scoped_buffer operator=(scoped_buffer& copyAssignment) = delete; - scoped_buffer& operator=(scoped_buffer&& moveAssignment) noexcept { delete[] _buffer; @@ -260,6 +301,16 @@ namespace blt } }; + template + class scoped_buffer : scoped_buffer + { + using scoped_buffer::scoped_buffer; + public: + scoped_buffer(const scoped_buffer& copy) = delete; + + scoped_buffer operator=(scoped_buffer& copyAssignment) = delete; + }; + template struct nullptr_initializer {