From 0d01c3050d01ea92b74b86de4dd4fd41d48a676b Mon Sep 17 00:00:00 2001
From: Jamie Reece Wilson <me@reece.sx>
Date: Sat, 20 Apr 2024 23:38:11 +0100
Subject: [PATCH] [+] AuHashMapOfHeap [+] AuListOfHeap [+] AuBSTOfHeap

---
 Include/auROXTL/auBST.hpp         | 3 +++
 Include/auROXTL/auHashMap.hpp     | 3 +++
 Include/auROXTL/auList.hpp        | 5 ++++-
 Include/auROXTL/auMemoryModel.hpp | 3 +++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Include/auROXTL/auBST.hpp b/Include/auROXTL/auBST.hpp
index 536e587..8c55f9d 100644
--- a/Include/auROXTL/auBST.hpp
+++ b/Include/auROXTL/auBST.hpp
@@ -16,6 +16,9 @@
 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 <class T, typename Z, typename LessThan_t = AuHash::less<T>>
+using AuBSTOfHeap = AuBST<T, Z, LessThan_t, Aurora::Memory::CppHeapWrapper<AuPair<const T, Z>>>;
+
 template<typename T>
 struct AuIsBST : AuFalseType
 { };
diff --git a/Include/auROXTL/auHashMap.hpp b/Include/auROXTL/auHashMap.hpp
index 48ed313..8c340ef 100644
--- a/Include/auROXTL/auHashMap.hpp
+++ b/Include/auROXTL/auHashMap.hpp
@@ -16,6 +16,9 @@
 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 <class T, class Z, class Hash_t = AuHash::hash<T>, class Equal_t = AuHash::equal<T>>
+using AuHashMapOfHeap = AuHashMap<T, Z, Hash_t, Equal_t, Aurora::Memory::CppHeapWrapper<AuPair<const T, Z>>>;
+
 template<typename T>
 struct AuIsHashMap : AuFalseType
 { };
diff --git a/Include/auROXTL/auList.hpp b/Include/auROXTL/auList.hpp
index 2f7d08c..46f2096 100644
--- a/Include/auROXTL/auList.hpp
+++ b/Include/auROXTL/auList.hpp
@@ -23,4 +23,7 @@
     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
+#endif
+
+template <class T>
+using AuListOfHeap = AuList<T, Aurora::Memory::CppHeapWrapper<T>>;
\ No newline at end of file
diff --git a/Include/auROXTL/auMemoryModel.hpp b/Include/auROXTL/auMemoryModel.hpp
index d3d2048..11aba30 100644
--- a/Include/auROXTL/auMemoryModel.hpp
+++ b/Include/auROXTL/auMemoryModel.hpp
@@ -247,6 +247,9 @@ static void auline AuSafeDelete(T *in)
 
 namespace Aurora::Memory
 {
+    template <class T>
+    struct CppHeapWrapper;
+
 #if defined(AURORA_ROXTL_ALLOCATORS_USE_STD)
 
     template<typename T>