diff options
| author | Elijah Thomas <42302100+elijah-thomas774@users.noreply.github.com> | 2024-05-31 20:07:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-31 20:07:48 -0400 |
| commit | 9d26f1bd6660eef16b2cbb94e1a20d67e81f4380 (patch) | |
| tree | 34b1f22b140d297b6d8a119ddf323098a130e63c /include | |
| parent | 9a1331edfa0a55fdb6fdb1e9dd3a49ea7c82d92a (diff) | |
| parent | ea4f3704470cd4ddb97ddbb41d344c66dfcb8768 (diff) | |
Merge pull request #48 from robojumper/m_allocator
m_allocator
Diffstat (limited to 'include')
| -rw-r--r-- | include/m/m_allocator.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/m/m_allocator.h b/include/m/m_allocator.h index d2d69cb3..e4f2a175 100644 --- a/include/m/m_allocator.h +++ b/include/m/m_allocator.h @@ -10,7 +10,7 @@ public: /* 0x08 */ virtual ~mAllocator_c(); /* 0x0C */ virtual void *alloc(u32 size); /* 0x10 */ virtual void free(void *block); - bool attach(EGG::Heap *heap, s32 align); + bool attach(EGG::Heap *heap, int align); }; class mHeapAllocator_c : public mAllocator_c { public: @@ -19,13 +19,13 @@ public: /* 0x08 */ virtual ~mHeapAllocator_c(); /* 0x0C */ // virtual void* alloc(u32 size); // see mAlloctor::alloc /* 0x10 */ // virtual void free(void* block); // see mAlloctor::free - int replaceWithNewFrmHeap(s32 size, EGG::Heap *newHeap, char *heapName, s32 align, u32 unk); - int replaceWithNewExpHeap(s32 size, EGG::Heap *newHeap, char *heapName, s32 align, u32 unk); + bool replaceWithNewFrmHeap(s32 size, EGG::Heap *newHeap, char *heapName, s32 align, u32 unk); + bool replaceWithNewExpHeap(s32 size, EGG::Heap *newHeap, char *heapName, s32 align, u32 unk); void destroyHeap(); s32 adjustFrmHeap(); s32 adjustExpHeap(); - s32 createNewTempFrmHeap(s32 size, EGG::Heap *newHeap, char *heapName, s32 align, u32 unk); + bool createNewTempFrmHeap(s32 size, EGG::Heap *newHeap, char *heapName, s32 align, u32 unk); void adjustFrmHeapRestoreCurrent(); - static void *allocOnHeap(s32 size, mHeapAllocator_c *allocator); + static void *allocOnHeap(u32 size, mHeapAllocator_c *allocator); }; #endif |