Revert "Add #ifdef declarations for NON_MATCHING code"

This reverts commit 42807160cfb33af9f3cf2fa6b0ba98f232208cdb.

It makes searching for NON_MATCHING comment descriptions much less
convenient in most text editors or IDEs, and we want the function
CSV to be the single source of truth for function statuses. Having
a function marked as matching but not built because of a stray #ifdef
would be bad.

1 files changed, 2 insertions, 6 deletions

diff --git a/src/KingSystem/Resource/resResourceMgrTask.cpp b/src/KingSystem/Resource/resResourceMgrTask.cpp
index babf010f..bda7572e 100644
--- a/src/KingSystem/Resource/resResourceMgrTask.cpp
+++ b/src/KingSystem/Resource/resResourceMgrTask.cpp
@@ -488,8 +488,7 @@ void ResourceMgrTask::updateResourceArenasFlag8() {
     mArenaForResourceL.updateFlag8(false);
 }
 
-// branching
-#ifdef NON_MATCHING
+// NON_MATCHING: branching
 sead::Heap* ResourceMgrTask::makeHeapForUnit(const MakeHeapArg& arg) {
     const auto heap_size = arg.heap_size;
     const auto path = arg.path;
@@ -518,7 +517,6 @@ sead::Heap* ResourceMgrTask::makeHeapForUnit(const MakeHeapArg& arg) {
     *arg.out_arena2 = arena;
     return heap;
 }
-#endif
 
 ResourceUnit* ResourceMgrTask::clearCachesAndGetUnit(const GetUnitArg& arg) {
     auto* unit = mUnitPool.tryAlloc();
@@ -674,8 +672,7 @@ void ResourceMgrTask::systemCalc_() {
     mTexHandleMgr->calc();
 }
 
-// reordering
-#ifdef NON_MATCHING
+// NON_MATCHING: reordering
 void ResourceMgrTask::setCompactionStopped(bool stopped) {
     u32 old_counter;
     if (stopped)
@@ -687,7 +684,6 @@ void ResourceMgrTask::setCompactionStopped(bool stopped) {
     if (mCompactionCounter == 0 || old_counter == 0)
         stubbedLogFunction();
 }
-#endif
 
 bool ResourceMgrTask::isCompactionStopped() const {
     return mCompactionCounter == 0;