Skip to content

Commit

Permalink
Merge pull request #138 from Fuzzy2319/HeapMgr
Browse files Browse the repository at this point in the history
HeapMgr minor changes
  • Loading branch information
leoetlino committed Jun 6, 2024
2 parents 0836299 + cbfbcf2 commit 1ae2ac7
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions include/heap/seadHeapMgr.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,19 @@ namespace sead
{
class HeapMgr : hostio::Node
{
struct AllocFailedCallbackArg;
struct AllocCallbackArg;
struct CreateCallbackArg;
struct DestroyCallbackArg;
struct FreeCallbackArg;
using IAllocFailedCallback = IDelegate1<const AllocFailedCallbackArg*>;
using IAllocCallback = IDelegate1<const AllocCallbackArg*>;
using ICreateCallback = IDelegate1<const CreateCallbackArg*>;
using IDestroyCallback = IDelegate1<const DestroyCallbackArg*>;
using IFreeCallback = IDelegate1<const FreeCallbackArg*>;

public:
struct AllocFailedCallbackArg;
using IAllocFailedCallback = IDelegate1<const AllocFailedCallbackArg*>;

HeapMgr();
virtual ~HeapMgr() {}

Expand Down Expand Up @@ -69,7 +70,7 @@ class HeapMgr : hostio::Node
friend class ScopedCurrentHeapSetter;

/// Set the current heap to the specified heap and returns the previous "current heap".
sead::Heap* setCurrentHeap_(sead::Heap* heap);
Heap* setCurrentHeap_(Heap* heap);

static Arena sDefaultArena;
static RootHeaps sRootHeaps;
Expand Down

0 comments on commit 1ae2ac7

Please sign in to comment.