From 00b9296aa9f9598cc483ba4598d9b84e4b732208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sat, 10 Oct 2020 13:30:21 +0200 Subject: ksys/res: Implement ResourceMgrTask::calc_ and fix MemoryTaskRequest --- src/KingSystem/Utils/Thread/Task.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/KingSystem/Utils/Thread/Task.cpp') diff --git a/src/KingSystem/Utils/Thread/Task.cpp b/src/KingSystem/Utils/Thread/Task.cpp index 7a3c3cff..e2ba464f 100644 --- a/src/KingSystem/Utils/Thread/Task.cpp +++ b/src/KingSystem/Utils/Thread/Task.cpp @@ -29,7 +29,7 @@ Task::~Task() { void Task::deleteDelegate_() { if (mDelegate && mFlags.isOn(Flag::DeleteDelegate) && mFlags.isOff(Flag::DoNotDeleteDelegate)) { - delete mDelegate; + ::operator delete(mDelegate); mDelegate = nullptr; } } @@ -170,7 +170,7 @@ void Task::removeFromQueue2() { void Task::run_() { if (mDelegate) - mDelegateResult = (*mDelegate)(mUserData); + mDelegateResult = mDelegate->invoke(mUserData); } bool Task::wait() { -- cgit v1.2.3