d_heap OK (#47)

* d_heap OK

* wibo workaround

1 files changed, 32 insertions, 0 deletions

diff --git a/include/egg/core/eggHeap.h b/include/egg/core/eggHeap.h
index e0730703..956a8bfd 100644
--- a/include/egg/core/eggHeap.h
+++ b/include/egg/core/eggHeap.h
@@ -145,6 +145,38 @@ public:
         return mName;
     }
 
+    struct AllocCallbackBundle {
+        HeapAllocCallback AllocCallback;
+        void *AllocCallbackArg;
+    };
+
+    struct FreeCallbackBundle {
+        HeapFreeCallback FreeCallback;
+        void *FreeCallbackArg;
+    };
+
+    static inline AllocCallbackBundle setAllocCallback(HeapAllocCallback AllocCallback, void *AllocCallbackArg) {
+        AllocCallbackBundle ret;
+
+        ret.AllocCallback = sAllocCallback;
+        ret.AllocCallbackArg = sAllocCallbackArg;
+        sAllocCallback = AllocCallback;
+        sAllocCallbackArg = AllocCallbackArg;
+
+        return ret;
+    }
+
+    static inline FreeCallbackBundle setFreeCallback(HeapFreeCallback FreeCallback, void *FreeCallbackArg) {
+        FreeCallbackBundle ret;
+
+        ret.FreeCallback = sFreeCallback;
+        ret.FreeCallbackArg = sFreeCallbackArg;
+        sFreeCallback = FreeCallback;
+        sFreeCallbackArg = FreeCallbackArg;
+
+        return ret;
+    }
+
     /* 80673ae8 */ static nw4r::ut::List sHeapList;
     /* 80673af8 */ static OSMutex sRootMutex;
     /* 80576740 */ static Heap *sCurrentHeap;