From df36d656650198b3cbf140e2982752a95b3f2c6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 27 Feb 2022 12:48:28 +0100 Subject: 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. --- src/KingSystem/Utils/Thread/TaskThread.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/KingSystem/Utils/Thread/TaskThread.cpp') diff --git a/src/KingSystem/Utils/Thread/TaskThread.cpp b/src/KingSystem/Utils/Thread/TaskThread.cpp index be24952b..27dcd4e9 100644 --- a/src/KingSystem/Utils/Thread/TaskThread.cpp +++ b/src/KingSystem/Utils/Thread/TaskThread.cpp @@ -136,9 +136,8 @@ bool TaskThread::isLookingForTask() const { return mFlags.isOn(Flag::IsLookingForTask); } -// branching for `if (mTaskQueue->getNumActiveTasks() == 0)`: +// NON_MATCHING: branching for `if (mTaskQueue->getNumActiveTasks() == 0)`: // Clang got rid of the branch and merged the two mFlags writes -#ifdef NON_MATCHING void TaskThread::calc_(sead::MessageQueue::Element msg) { if (mFlags.isOn(Flag::Paused)) { if (msg != cMessage_Resume) @@ -240,7 +239,6 @@ void TaskThread::calc_(sead::MessageQueue::Element msg) { mFlags.reset(Flag::IsActive); mFlags.reset(Flag::IsLookingForTask); } -#endif bool TaskThread::receivedPauseMsg() const { return mMessageQueue.peek(sead::MessageQueue::BlockType::NonBlocking) == cMessage_Pause; -- cgit v1.2.3