diff options
| author | 2015-01-20 17:41:12 -0500 | |
|---|---|---|
| committer | 2015-01-21 20:47:49 -0500 | |
| commit | c68eb1569549ae49ae25c6c29cec2e10d8329f2d (patch) | |
| tree | 4a8683aac99095884acaf488aa4d059f861138b3 /src/core/hle/kernel/thread.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/kernel/thread.cpp')
| -rw-r--r-- | src/core/hle/kernel/thread.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 271828ea7..8a2cf8bf4 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | namespace Kernel { | 23 | namespace Kernel { |
| 24 | 24 | ||
| 25 | ResultVal<bool> Thread::Wait() { | 25 | ResultVal<bool> Thread::ShouldWait() { |
| 26 | return MakeResult<bool>(status != THREADSTATUS_DORMANT); | 26 | return MakeResult<bool>(status != THREADSTATUS_DORMANT); |
| 27 | } | 27 | } |
| 28 | 28 | ||
| @@ -269,7 +269,7 @@ void Thread::ReleaseWaitObject(WaitObject* wait_object) { | |||
| 269 | 269 | ||
| 270 | // Iterate through all waiting objects to check availability... | 270 | // Iterate through all waiting objects to check availability... |
| 271 | for (auto itr = wait_objects.begin(); itr != wait_objects.end(); ++itr) { | 271 | for (auto itr = wait_objects.begin(); itr != wait_objects.end(); ++itr) { |
| 272 | auto res = (*itr)->Wait(); | 272 | auto res = (*itr)->ShouldWait(); |
| 273 | 273 | ||
| 274 | if (*res && res.Succeeded()) | 274 | if (*res && res.Succeeded()) |
| 275 | wait_all_failed = true; | 275 | wait_all_failed = true; |