tmp

Containers/public/Buffer2D.hpp

@@ -13,7 +13,12 @@ namespace tp {
 	class Buffer2D {
 	public:
 		typedef ualni Index;
-		typedef Pair<Index, Index> Index2D;
+
+		struct Index2D {
+			Index x = 0;
+			Index y = 0;
+		};
+
 		typedef SelectValueOrReference<tType> tTypeArg;
 
 	private:

Containers/public/ContainersCommon.hpp

@@ -4,7 +4,6 @@
 #include "Module.hpp"
 
 namespace tp {
-	extern ModuleManifest gModuleContainers;
 
 	class DefaultAllocator {
 	public:

Containers/public/Map.hpp

@@ -164,7 +164,6 @@ namespace tp {
 
 	public:
 		Map() {
-			MODULE_SANITY_CHECK(gModuleContainers)
 			mNSlots = next2pow(uhalni(tTableInitialSize - 1));
 			mTable = newTable(mNSlots);
 		}
@@ -243,7 +242,13 @@ namespace tp {
 			if (this == &in) {
 				return *this;
 			}
-			removeAll();
+			
+			for (ualni i = 0; i < mNSlots; i++) {
+				if (mTable[i] && !isDeletedNode(mTable[i])) {
+					deleteNode(mTable[i]);
+				}
+			}
+			mNEntries = 0;
 			mNSlots = in.mNSlots;
 			deleteTable(mTable);
 			mTable = newTable(mNSlots);

Containers/public/Tree.hpp

@@ -62,7 +62,7 @@ namespace tp {
 		};
 
 	public:
-		AvlTree() { MODULE_SANITY_CHECK(gModuleContainers) }
+		AvlTree() {}
 		~AvlTree() { removeAll(); }
 
 		[[nodiscard]] ualni size() const { return mSize; }