[MOVE] A left over from the move implemtations. One that is only foun…

…d if you use it ;-) (rdkcentral#1581)
bramoosterhuis · Apr 30, 2024 · effa74c · effa74c
1 parent c0bfab6
commit effa74c
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/Source/core/Frame.h b/Source/core/Frame.h
@@ -111,7 +111,7 @@ namespace Core {
         template <const uint32_t STARTSIZE, typename SIZETYPE>
         class AllocatorType {
         public:
-            AllocatorType<STARTSIZE, SIZETYPE> operator=(const AllocatorType<STARTSIZE, SIZETYPE>&) = delete;
+            AllocatorType<STARTSIZE, SIZETYPE>& operator=(const AllocatorType<STARTSIZE, SIZETYPE>& copy) = delete;
 
             AllocatorType()
                 : _bufferSize(STARTSIZE)
@@ -173,6 +173,21 @@ namespace Core {
                 }
             }
 
+            AllocatorType<STARTSIZE, SIZETYPE>& operator=(AllocatorType<STARTSIZE, SIZETYPE>&& move) {
+                if (STARTSIZE != 0) {
+                    if (_data != nullptr) {
+                        ::free(_data);
+                    }
+                    _data ==  move._data;
+                    move._data = nullptr;
+                    _bufferSize = move._bufferSize;
+                }
+                else {
+                    ::memcpy(_data, move._data, _bufferSize);
+                }
+                return (*this);
+            }
+
         public:
             inline uint8_t& operator[](const SIZETYPE index)
             {
@@ -527,7 +542,7 @@ namespace Core {
         FrameType<BLOCKSIZE, BIG_ENDIAN_ORDERING, SIZE_CONTEXT>& operator=(FrameType<BLOCKSIZE, BIG_ENDIAN_ORDERING, SIZE_CONTEXT>&& move) {
             if (this != &move) {
                 _size = move._size;
-                _data = std::move(move.data);
+                _data = std::move(move._data);
 
                 move._size = 0;
             }