aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/hle/kernel/mutex.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/mutex.cpp
parent69c5830ef2a0190803e176615d5cb16d5462b971 (diff)
WaitObject: Renamed "Wait" to "ShouldWait", made "ShouldWait" and "Acquire" pure virtual.
Diffstat (limited to 'src/core/hle/kernel/mutex.cpp')
-rw-r--r--src/core/hle/kernel/mutex.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp
index 6cd14037..01d2263f 100644
--- a/src/core/hle/kernel/mutex.cpp
+++ b/src/core/hle/kernel/mutex.cpp
@@ -27,7 +27,7 @@ public:
std::string name; ///< Name of mutex (optional)
SharedPtr<Thread> current_thread; ///< Thread that has acquired the mutex
- ResultVal<bool> Wait() override;
+ ResultVal<bool> ShouldWait() override;
ResultVal<bool> Acquire() override;
};
@@ -159,7 +159,7 @@ Handle CreateMutex(bool initial_locked, const std::string& name) {
return handle;
}
-ResultVal<bool> Mutex::Wait() {
+ResultVal<bool> Mutex::ShouldWait() {
return MakeResult<bool>(locked && (current_thread != GetCurrentThread()));
}