From b3e0a6df31c4793accf5089032f1012c6a11388d Mon Sep 17 00:00:00 2001
From: Jamie Reece Wilson <me@reece.sx>
Date: Sat, 20 Apr 2024 00:09:22 +0100
Subject: [PATCH] [*] Improve AuList, AuHashMap, and AuBST template

---
 Include/auROXTL/auBST.hpp     |  9 ++++-----
 Include/auROXTL/auHashMap.hpp |  8 ++++----
 Include/auROXTL/auList.hpp    | 13 ++++---------
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/Include/auROXTL/auBST.hpp b/Include/auROXTL/auBST.hpp
index 8ab8198..536e587 100644
--- a/Include/auROXTL/auBST.hpp
+++ b/Include/auROXTL/auBST.hpp
@@ -13,16 +13,15 @@
 
 #include "auHashUtils.hpp"
 
-template <class T, typename Z, typename LessThan_t = AuHash::less<T>>
-using AuBST = AURORA_RUNTIME_AU_BST<T, Z, LessThan_t>;
-
+template <class T, typename Z, typename LessThan_t = AuHash::less<T>, class Allocator_t = Aurora::Memory::ClassArrayAllocator<AuPair<const T, Z>>>
+using AuBST = AURORA_RUNTIME_AU_BST<T, Z, LessThan_t, Allocator_t>;
 
 template<typename T>
 struct AuIsBST : AuFalseType
 { };
 
-template<typename T, typename Z>
-struct AuIsBST<AuBST<T, Z>> : AuTrueType
+template<typename T, typename Z, typename A, typename B>
+struct AuIsBST<AuBST<T, Z, A, B>> : AuTrueType
 { };
 
 template <class T>
diff --git a/Include/auROXTL/auHashMap.hpp b/Include/auROXTL/auHashMap.hpp
index fffc9de..48ed313 100644
--- a/Include/auROXTL/auHashMap.hpp
+++ b/Include/auROXTL/auHashMap.hpp
@@ -13,15 +13,15 @@
 
 #include "auHashUtils.hpp"
 
-template <class T, class Z, class Hash_t = AuHash::hash<T>, class Equal_t = AuHash::equal<T>>
-using AuHashMap = AURORA_RUNTIME_AU_HASH_MAP<T, Z, Hash_t, Equal_t>;
+template <class T, class Z, class Hash_t = AuHash::hash<T>, class Equal_t = AuHash::equal<T>, class Allocator_t = Aurora::Memory::ClassArrayAllocator<AuPair<const T, Z>>>
+using AuHashMap = AURORA_RUNTIME_AU_HASH_MAP<T, Z, Hash_t, Equal_t, Allocator_t>;
 
 template<typename T>
 struct AuIsHashMap : AuFalseType
 { };
 
-template<typename T, typename Z>
-struct AuIsHashMap<AuHashMap<T, Z>> : AuTrueType
+template<typename T, typename Z, typename H, typename E, typename A>
+struct AuIsHashMap<AuHashMap<T, Z, H, E, A>> : AuTrueType
 { };
 
 template <class T>
diff --git a/Include/auROXTL/auList.hpp b/Include/auROXTL/auList.hpp
index af6395d..2f7d08c 100644
--- a/Include/auROXTL/auList.hpp
+++ b/Include/auROXTL/auList.hpp
@@ -15,17 +15,12 @@
 
 #if defined(AURORA_ROXTL_CONTAINERS_USE_PURE)
 
-    template <class T>
-    using AuList = AURORA_RUNTIME_AU_LIST<T>;
+    template <class T, class Allocator_t = AuConditional_t<AuIsClass_v<T>, Aurora::Memory::ClassArrayAllocator<T>, Aurora::Memory::PrimitiveArrayAllocator<T>>>
+    using AuList = AURORA_RUNTIME_AU_LIST<T, Allocator_t>;
 
 #else
 
-    template <class T>
-    using AuList = AURORA_RUNTIME_AU_LIST<T, 
-                                            AuConditional_t<AuIsClass_v<T>,
-                                                            Aurora::Memory::ClassArrayAllocator<T>,
-                                                            Aurora::Memory::PrimitiveArrayAllocator<T>
-                                            >
-                                         >;
+    template <class T, class Allocator_t = AuConditional_t<AuIsClass_v<T>, Aurora::Memory::ClassArrayAllocator<T>, Aurora::Memory::PrimitiveArrayAllocator<T>>>
+    using AuList = AURORA_RUNTIME_AU_LIST<T, Allocator_t>;
 
 #endif
\ No newline at end of file