diff options
| author | bunnei <bunneidev@gmail.com> | 2015-01-20 17:41:12 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-01-21 20:47:49 -0500 |
| commit | c68eb1569549ae49ae25c6c29cec2e10d8329f2d (patch) | |
| tree | 4a8683aac99095884acaf488aa4d059f861138b3 /src/core/hle/svc.cpp | |
| parent | 69c5830ef2a0190803e176615d5cb16d5462b971 (diff) | |
WaitObject: Renamed "Wait" to "ShouldWait", made "ShouldWait" and "Acquire" pure virtual.
Diffstat (limited to 'src/core/hle/svc.cpp')
| -rw-r--r-- | src/core/hle/svc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index d72839172..fd2d22727 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp @@ -122,7 +122,7 @@ static Result WaitSynchronization1(Handle handle, s64 nano_seconds) { LOG_TRACE(Kernel_SVC, "called handle=0x%08X(%s:%s), nanoseconds=%lld", handle, object->GetTypeName().c_str(), object->GetName().c_str(), nano_seconds); - ResultVal<bool> wait = object->Wait(); + ResultVal<bool> wait = object->ShouldWait(); // Check for next thread to schedule if (wait.Succeeded() && *wait) { @@ -167,7 +167,7 @@ static Result WaitSynchronizationN(s32* out, Handle* handles, s32 handle_count, if (object == nullptr) return InvalidHandle(ErrorModule::Kernel).raw; - ResultVal<bool> wait = object->Wait(); + ResultVal<bool> wait = object->ShouldWait(); // Check if the current thread should wait on this object... if (wait.Succeeded() && *wait) { |