summaryrefslogtreecommitdiff
path: root/src/KingSystem/System/OverlayArena.cpp
diff options
context:
space:
mode:
authorAlexApps99 <alex.apps99@gmail.com>2021-07-26 21:58:51 +1200
committerAlexApps99 <alex.apps99@gmail.com>2021-07-26 23:05:19 +1200
commit42807160cfb33af9f3cf2fa6b0ba98f232208cdb (patch)
tree95b1b16a3f4cf7d0ab51e90b3d73e53f74ba7f2b /src/KingSystem/System/OverlayArena.cpp
parent88bcc9eec1481b47361dc717c83e4953e8929a2b (diff)
Add #ifdef declarations for NON_MATCHING code
Diffstat (limited to 'src/KingSystem/System/OverlayArena.cpp')
-rw-r--r--src/KingSystem/System/OverlayArena.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/KingSystem/System/OverlayArena.cpp b/src/KingSystem/System/OverlayArena.cpp
index 62ae8a8c..26a999ea 100644
--- a/src/KingSystem/System/OverlayArena.cpp
+++ b/src/KingSystem/System/OverlayArena.cpp
@@ -16,7 +16,8 @@ OverlayArena::~OverlayArena() {
destroy();
}
-// NON_MATCHING: branching at the end (csel instead of a branch)
+// branching at the end (csel instead of a branch)
+#ifdef NON_MATCHING
bool OverlayArena::init(const OverlayArena::InitArg& arg) {
if (!arg.heap) {
res::stubbedLogFunction();
@@ -59,6 +60,7 @@ bool OverlayArena::init(const OverlayArena::InitArg& arg) {
return true;
}
+#endif
void OverlayArena::stubbed() {}
@@ -126,7 +128,8 @@ bool OverlayArena::checkIsOom() const {
// FIXME: figure out what sead function this is
bool seadCheckPointer(void* ptr);
-// NON_MATCHING: branching
+// branching
+#ifdef NON_MATCHING
util::DualHeap* OverlayArena::makeDualHeap(u32 size, const sead::SafeString& name,
sead::Heap::HeapDirection direction,
res::ResourceUnit* unit, bool) {
@@ -157,6 +160,7 @@ util::DualHeap* OverlayArena::makeDualHeap(u32 size, const sead::SafeString& nam
mFlags.set(Flag::_4);
return heap;
}
+#endif
void OverlayArena::addSize(s32 size) {
mSize += size;