summaryrefslogtreecommitdiff
path: root/include/JSystem/JKernel
diff options
context:
space:
mode:
Diffstat (limited to 'include/JSystem/JKernel')
-rw-r--r--include/JSystem/JKernel/JKRExpHeap.h9
-rw-r--r--include/JSystem/JKernel/JKRSolidHeap.h3
2 files changed, 7 insertions, 5 deletions
diff --git a/include/JSystem/JKernel/JKRExpHeap.h b/include/JSystem/JKernel/JKRExpHeap.h
index 57fad0b8f6..dcadbef8d4 100644
--- a/include/JSystem/JKernel/JKRExpHeap.h
+++ b/include/JSystem/JKernel/JKRExpHeap.h
@@ -75,8 +75,9 @@ public:
/* vt[22] */ virtual bool state_compare(JKRHeap::TState const&,
JKRHeap::TState const&) const; /* override */
+ u8 field_0x6c;
+
private:
- u32 field_0x6c;
u32 field_0x70;
u32 field_0x74;
CMemBlock* mHeadFreeList;
@@ -85,9 +86,9 @@ private:
CMemBlock* mTailUsedList;
public:
- static void createRoot(int, bool);
- static void create(u32, JKRHeap*, bool);
- static void create(void*, u32, JKRHeap*, bool);
+ static JKRExpHeap* createRoot(int, bool);
+ static JKRExpHeap* create(u32, JKRHeap*, bool);
+ static JKRExpHeap* create(void*, u32, JKRHeap*, bool);
};
#endif /* JKREXPHEAP_H */
diff --git a/include/JSystem/JKernel/JKRSolidHeap.h b/include/JSystem/JKernel/JKRSolidHeap.h
index c190314459..a61e8cc78b 100644
--- a/include/JSystem/JKernel/JKRSolidHeap.h
+++ b/include/JSystem/JKernel/JKRSolidHeap.h
@@ -18,7 +18,6 @@ protected:
JKRSolidHeap(void*, u32, JKRHeap*, bool);
virtual ~JKRSolidHeap();
- s32 adjustSize(void);
void* allocFromHead(u32, int);
void* allocFromTail(u32, int);
@@ -54,6 +53,8 @@ private:
/* 0x78 */ Unknown* field_0x78;
public:
+ s32 adjustSize(void);
+
static JKRSolidHeap* create(u32, JKRHeap*, bool);
};