diff options
| author | AlexApps99 <alex.apps99@gmail.com> | 2021-07-26 21:58:51 +1200 |
|---|---|---|
| committer | AlexApps99 <alex.apps99@gmail.com> | 2021-07-26 23:05:19 +1200 |
| commit | 42807160cfb33af9f3cf2fa6b0ba98f232208cdb (patch) | |
| tree | 95b1b16a3f4cf7d0ab51e90b3d73e53f74ba7f2b /src/KingSystem/Resource/resResourceMgrTask.cpp | |
| parent | 88bcc9eec1481b47361dc717c83e4953e8929a2b (diff) | |
Add #ifdef declarations for NON_MATCHING code
Diffstat (limited to 'src/KingSystem/Resource/resResourceMgrTask.cpp')
| -rw-r--r-- | src/KingSystem/Resource/resResourceMgrTask.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/KingSystem/Resource/resResourceMgrTask.cpp b/src/KingSystem/Resource/resResourceMgrTask.cpp index e9d0e75e..4497d4f4 100644 --- a/src/KingSystem/Resource/resResourceMgrTask.cpp +++ b/src/KingSystem/Resource/resResourceMgrTask.cpp @@ -478,7 +478,8 @@ void ResourceMgrTask::updateResourceArenasFlag8() { mArenaForResourceL.updateFlag8(false); } -// NON_MATCHING: branching +// branching +#ifdef NON_MATCHING sead::Heap* ResourceMgrTask::makeHeapForUnit(const MakeHeapArg& arg) { const auto heap_size = arg.heap_size; const auto path = arg.path; @@ -507,6 +508,7 @@ sead::Heap* ResourceMgrTask::makeHeapForUnit(const MakeHeapArg& arg) { *arg.out_arena2 = arena; return heap; } +#endif ResourceUnit* ResourceMgrTask::clearCachesAndGetUnit(const GetUnitArg& arg) { auto* unit = mUnitPool.tryAlloc(); @@ -627,7 +629,8 @@ bool ResourceMgrTask::getUncompressedSize(u32* size, const sead::SafeString& pat return true; } -// NON_MATCHING: reordering +// reordering +#ifdef NON_MATCHING void ResourceMgrTask::setCompactionStopped(bool stopped) { u32 old_counter; if (stopped) @@ -639,6 +642,7 @@ void ResourceMgrTask::setCompactionStopped(bool stopped) { if (mCompactionCounter == 0 || old_counter == 0) stubbedLogFunction(); } +#endif bool ResourceMgrTask::isCompactionStopped() const { return mCompactionCounter == 0; |
