From 42807160cfb33af9f3cf2fa6b0ba98f232208cdb Mon Sep 17 00:00:00 2001 From: AlexApps99 Date: Mon, 26 Jul 2021 21:58:51 +1200 Subject: Add #ifdef declarations for NON_MATCHING code --- src/KingSystem/Utils/Thread/TaskMgr.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/KingSystem/Utils/Thread/TaskMgr.cpp') diff --git a/src/KingSystem/Utils/Thread/TaskMgr.cpp b/src/KingSystem/Utils/Thread/TaskMgr.cpp index b5eec563..f8aa6f2c 100644 --- a/src/KingSystem/Utils/Thread/TaskMgr.cpp +++ b/src/KingSystem/Utils/Thread/TaskMgr.cpp @@ -80,7 +80,8 @@ void TaskMgr::submitRequest(TaskMgrRequest& request) { request.task = nullptr; } -// NON_MATCHING: reorderings +// reorderings +#ifdef NON_MATCHING bool TaskMgr::fetchIdleTaskForRequest_(TaskMgrRequest& request, bool retry_until_success) { if (!hasTasks()) return false; @@ -108,6 +109,7 @@ bool TaskMgr::fetchIdleTaskForRequest_(TaskMgrRequest& request, bool retry_until request.task = task; return true; } +#endif void TaskMgr::freeTask(ManagedTask* task) { auto lock = sead::makeScopedLock(mCS2); @@ -155,7 +157,8 @@ bool TaskMgr::trySubmitRequest(TaskMgrRequest& request) { return ok; } -// NON_MATCHING: the factory invoke function pointer is loaded earlier in the original code +// the factory invoke function pointer is loaded earlier in the original code +#ifdef NON_MATCHING void TaskMgr::init(s32 num_tasks, sead::Heap* heap, ManagedTaskFactory& factory) { if (!heap->isFreeable()) mFlags.reset(Flag::HeapIsFreeable); @@ -177,6 +180,7 @@ void TaskMgr::init(s32 num_tasks, sead::Heap* heap, ManagedTaskFactory& factory) factory(&mTask); } +#endif bool TaskMgr::hasTasks() const { return mTasks.size() > 0; -- cgit v1.2.3