diff --git a/mesosphere/include/mesosphere/threading/KThread.hpp b/mesosphere/include/mesosphere/threading/KThread.hpp index 8575e4d5b..1a4b1a7e7 100644 --- a/mesosphere/include/mesosphere/threading/KThread.hpp +++ b/mesosphere/include/mesosphere/threading/KThread.hpp @@ -295,7 +295,7 @@ private: uiptr kernelStackTop = 0; KSynchronizationObject *signaledSyncObject = nullptr; - Result syncResult = ResultSuccess{}; + Result syncResult = ResultSuccess(); u64 lastScheduledTime = 0; }; diff --git a/mesosphere/source/threading/KEvent.cpp b/mesosphere/source/processes/KEvent.cpp similarity index 93% rename from mesosphere/source/threading/KEvent.cpp rename to mesosphere/source/processes/KEvent.cpp index e68ba0091..050a129bd 100644 --- a/mesosphere/source/threading/KEvent.cpp +++ b/mesosphere/source/processes/KEvent.cpp @@ -20,7 +20,7 @@ Result KEvent::Initialize() SetResourceOwner(KCoreContext::GetCurrentInstance().GetCurrentProcess()); isInitialized = true; - return ResultSuccess{}; + return ResultSuccess(); } } \ No newline at end of file diff --git a/mesosphere/source/processes/KReadableEvent.cpp b/mesosphere/source/processes/KReadableEvent.cpp index 0d141814d..0c86ea3fb 100644 --- a/mesosphere/source/processes/KReadableEvent.cpp +++ b/mesosphere/source/processes/KReadableEvent.cpp @@ -24,14 +24,14 @@ Result KReadableEvent::Signal() NotifyWaiters(); } - return ResultSuccess{}; + return ResultSuccess(); } Result KReadableEvent::Clear() { Reset(); - return ResultSuccess{}; + return ResultSuccess(); } Result KReadableEvent::Reset() @@ -40,9 +40,9 @@ Result KReadableEvent::Reset() if (this->isSignaled) { this->isSignaled = false; - return ResultSuccess{}; + return ResultSuccess(); } - return ResultKernelInvalidState{}; + return ResultKernelInvalidState(); } } diff --git a/mesosphere/source/threading/KThread.cpp b/mesosphere/source/threading/KThread.cpp index fafa4b3f0..51a1c2774 100644 --- a/mesosphere/source/threading/KThread.cpp +++ b/mesosphere/source/threading/KThread.cpp @@ -125,7 +125,7 @@ void KThread::HandleSyncObjectSignaled(KSynchronizationObject *syncObj) { if (GetSchedulingStatus() == SchedulingStatus::Paused) { signaledSyncObject = syncObj; - syncResult = ResultSuccess{}; + syncResult = ResultSuccess(); Reschedule(SchedulingStatus::Running); } } @@ -152,13 +152,13 @@ Result KThread::WaitSynchronizationImpl(int &outId, KSynchronizationObject **syn } if (timeoutTime == KSystemClock::time_point{} && outId == -1) { - return ResultKernelTimedOut{}; + return ResultKernelTimedOut(); } if (IsDying()) { - return ResultKernelThreadTerminating{}; + return ResultKernelThreadTerminating(); } if (cancelled) { - return ResultKernelCancelled{}; + return ResultKernelCancelled(); } for (int i = 0; i < numSyncObjs; i++) { @@ -167,7 +167,7 @@ Result KThread::WaitSynchronizationImpl(int &outId, KSynchronizationObject **syn isWaitingSync = true; signaledSyncObject = nullptr; - syncResult = ResultKernelTimedOut{}; + syncResult = ResultKernelTimedOut(); Reschedule(SchedulingStatus::Paused); if (timeoutTime > KSystemClock::time_point{}) {