Checkpoint: growable linked list (untested)

Author: Fletterio

include/nbl/core/containers/GrowableDoublyLinkedList.h

@@ -42,16 +42,20 @@ class GrowableDoublyLinkedList : public DoublyLinkedListBase<Value>
 
 	inline void grow(uint32_t newCapacity)
 	{
+		// Same as code found in ContiguousMemoryLinkedListBase to create aligned space
 		const auto firstPart = core::alignUp(address_allocator_t::reserved_size(1u, newCapacity, 1u), alignof(node_t));
 		void* newReservedSpace = _NBL_ALIGNED_MALLOC(firstPart + newCapacity * sizeof(node_t), alignof(node_t));
 		node_t* newArray = reinterpret_cast<node_t*>(reinterpret_cast<uint8_t*>(newReservedSpace) + firstPart);
 
+		// Copy memory over to new buffer, then free old one
 		memcpy(reinterpret_cast<void*>(newArray), reinterpret_cast<void*>(this->m_array), m_cap * sizeof(node_t));
+		_NBL_ALIGNED_FREE(m_reservedSpace);
 
-		//this->m_addressAllocator = std::unique_ptr<address_allocator_t>(new address_allocator_t(newCapacity, std::move(this->m_addressAllocator)));
-		this->m_cap = capacity;
-		this->m_back = invalid_iterator;
-		this->m_begin = invalid_iterator;
+		// Finally, create new address allocator from old one
+		this->m_addressAllocator = std::unique_ptr<address_allocator_t>(new address_allocator_t(newCapacity, std::move(*(this->m_addressAllocator)), newReservedSpace));
+		this->m_cap = newCapacity;
+		this->m_array = newArray;
+		this->m_reservedSpace = newReservedSpace;
 	}
 };
 

include/nbl/core/containers/lists/DoublyLinkedListBase.h

@@ -69,7 +69,7 @@ class DoublyLinkedListBase : public impl::ContiguousMemoryLinkedListBase<SDoubly
 	_NBL_STATIC_INLINE_CONSTEXPR uint32_t invalid_iterator = base_t::invalid_iterator;
 
 	//remove the last element in the list
-	inline virtual void popBack() final
+	inline virtual void popBack() override final
 	{
 		if (this->m_back == invalid_iterator)
 			return;
@@ -83,7 +83,7 @@ class DoublyLinkedListBase : public impl::ContiguousMemoryLinkedListBase<SDoubly
 	}
 
 	//remove a node at nodeAddr from the list
-	inline virtual void erase(const uint32_t nodeAddr) final
+	inline virtual void erase(const uint32_t nodeAddr) override final
 	{
 		assert(nodeAddr != invalid_iterator);
 		assert(nodeAddr < this->m_cap);
@@ -99,7 +99,7 @@ class DoublyLinkedListBase : public impl::ContiguousMemoryLinkedListBase<SDoubly
 	}
 
 	//move a node at nodeAddr to the front of the list
-	inline virtual void moveToFront(const uint32_t nodeAddr) final
+	inline virtual void moveToFront(const uint32_t nodeAddr) override final
 	{
 		if (this->m_begin == nodeAddr || nodeAddr == invalid_iterator)
 			return;
@@ -137,7 +137,7 @@ class DoublyLinkedListBase : public impl::ContiguousMemoryLinkedListBase<SDoubly
 
 private:
 	//create a new node which stores data at already allocated address, 
-	inline virtual void insertAt(uint32_t addr, value_t&& val) final
+	inline virtual void insertAt(uint32_t addr, value_t&& val) override final
 	{
 		assert(addr < this->m_cap);
 		assert(addr != invalid_iterator);
@@ -152,7 +152,7 @@ class DoublyLinkedListBase : public impl::ContiguousMemoryLinkedListBase<SDoubly
 		this->m_begin = addr;
 	}
 
-	inline virtual void common_detach(node_t* node) final
+	inline virtual void common_detach(node_t* node) override final
 	{
 		if (node->next != invalid_iterator)
 			this->get(node->next)->prev = node->prev;