aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/hle/kernel/thread.cpp
diff options
context:
space:
mode:
authorGravatar bunnei <bunneidev@gmail.com>2015-01-20 17:41:12 -0500
committerGravatar bunnei <bunneidev@gmail.com>2015-01-21 20:47:49 -0500
commitc68eb1569549ae49ae25c6c29cec2e10d8329f2d (patch)
tree4a8683aac99095884acaf488aa4d059f861138b3 /src/core/hle/kernel/thread.cpp
parent69c5830ef2a0190803e176615d5cb16d5462b971 (diff)
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.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index 271828ea..8a2cf8bf 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -22,7 +22,7 @@
namespace Kernel {
-ResultVal<bool> Thread::Wait() {
+ResultVal<bool> Thread::ShouldWait() {
return MakeResult<bool>(status != THREADSTATUS_DORMANT);
}
@@ -269,7 +269,7 @@ void Thread::ReleaseWaitObject(WaitObject* wait_object) {
// Iterate through all waiting objects to check availability...
for (auto itr = wait_objects.begin(); itr != wait_objects.end(); ++itr) {
- auto res = (*itr)->Wait();
+ auto res = (*itr)->ShouldWait();
if (*res && res.Succeeded())
wait_all_failed = true;