summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/mutex.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2015-01-20 17:41:12 -0500
committerGravatar bunnei2015-01-21 20:47:49 -0500
commitc68eb1569549ae49ae25c6c29cec2e10d8329f2d (patch)
tree4a8683aac99095884acaf488aa4d059f861138b3 /src/core/hle/kernel/mutex.cpp
parentEvent: Fix implementation of "non-sticky" events. (diff)
downloadyuzu-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/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 6cd140376..01d2263ff 100644
--- a/src/core/hle/kernel/mutex.cpp
+++ b/src/core/hle/kernel/mutex.cpp
@@ -27,7 +27,7 @@ public:
27 std::string name; ///< Name of mutex (optional) 27 std::string name; ///< Name of mutex (optional)
28 SharedPtr<Thread> current_thread; ///< Thread that has acquired the mutex 28 SharedPtr<Thread> current_thread; ///< Thread that has acquired the mutex
29 29
30 ResultVal<bool> Wait() override; 30 ResultVal<bool> ShouldWait() override;
31 ResultVal<bool> Acquire() override; 31 ResultVal<bool> Acquire() override;
32}; 32};
33 33
@@ -159,7 +159,7 @@ Handle CreateMutex(bool initial_locked, const std::string& name) {
159 return handle; 159 return handle;
160} 160}
161 161
162ResultVal<bool> Mutex::Wait() { 162ResultVal<bool> Mutex::ShouldWait() {
163 return MakeResult<bool>(locked && (current_thread != GetCurrentThread())); 163 return MakeResult<bool>(locked && (current_thread != GetCurrentThread()));
164} 164}
165 165