diff options
| author |  bunnei | 2015-01-20 17:41:12 -0500 |
|---|---|---|
| committer | bunnei | 2015-01-21 20:47:49 -0500 |
| commit | c68eb1569549ae49ae25c6c29cec2e10d8329f2d (patch) | |
| tree | 4a8683aac99095884acaf488aa4d059f861138b3 /src/core/hle/svc.cpp | |
| parent | Event: Fix implementation of "non-sticky" events. (diff) | |
| download | yuzu-c68eb1569549ae49ae25c6c29cec2e10d8329f2d.tar.gz yuzu-c68eb1569549ae49ae25c6c29cec2e10d8329f2d.tar.xz yuzu-c68eb1569549ae49ae25c6c29cec2e10d8329f2d.zip | |
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) { | |||
| 122 | LOG_TRACE(Kernel_SVC, "called handle=0x%08X(%s:%s), nanoseconds=%lld", handle, | 122 | LOG_TRACE(Kernel_SVC, "called handle=0x%08X(%s:%s), nanoseconds=%lld", handle, |
| 123 | object->GetTypeName().c_str(), object->GetName().c_str(), nano_seconds); | 123 | object->GetTypeName().c_str(), object->GetName().c_str(), nano_seconds); |
| 124 | 124 | ||
| 125 | ResultVal<bool> wait = object->Wait(); | 125 | ResultVal<bool> wait = object->ShouldWait(); |
| 126 | 126 | ||
| 127 | // Check for next thread to schedule | 127 | // Check for next thread to schedule |
| 128 | if (wait.Succeeded() && *wait) { | 128 | if (wait.Succeeded() && *wait) { |
| @@ -167,7 +167,7 @@ static Result WaitSynchronizationN(s32* out, Handle* handles, s32 handle_count, | |||
| 167 | if (object == nullptr) | 167 | if (object == nullptr) |
| 168 | return InvalidHandle(ErrorModule::Kernel).raw; | 168 | return InvalidHandle(ErrorModule::Kernel).raw; |
| 169 | 169 | ||
| 170 | ResultVal<bool> wait = object->Wait(); | 170 | ResultVal<bool> wait = object->ShouldWait(); |
| 171 | 171 | ||
| 172 | // Check if the current thread should wait on this object... | 172 | // Check if the current thread should wait on this object... |
| 173 | if (wait.Succeeded() && *wait) { | 173 | if (wait.Succeeded() && *wait) { |