summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/timer.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2015-01-20 18:16:45 -0500
committerGravatar bunnei2015-01-21 20:47:49 -0500
commit15b6a4d9add6b260a2a1a84ab6228addced4f851 (patch)
treee9934863ebd6483cabae0f6c280fab7e34eee32e /src/core/hle/kernel/timer.cpp
parentWaitObject: Renamed "Wait" to "ShouldWait", made "ShouldWait" and "Acquire" p... (diff)
downloadyuzu-15b6a4d9add6b260a2a1a84ab6228addced4f851.tar.gz
yuzu-15b6a4d9add6b260a2a1a84ab6228addced4f851.tar.xz
yuzu-15b6a4d9add6b260a2a1a84ab6228addced4f851.zip
Kernel: Changed "ShouldWait" to return bool and "Acquire" to return void.
Diffstat (limited to 'src/core/hle/kernel/timer.cpp')
-rw-r--r--src/core/hle/kernel/timer.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp
index 1729cca0f..8d9db92a4 100644
--- a/src/core/hle/kernel/timer.cpp
+++ b/src/core/hle/kernel/timer.cpp
@@ -29,12 +29,12 @@ public:
29 u64 initial_delay; ///< The delay until the timer fires for the first time 29 u64 initial_delay; ///< The delay until the timer fires for the first time
30 u64 interval_delay; ///< The delay until the timer fires after the first time 30 u64 interval_delay; ///< The delay until the timer fires after the first time
31 31
32 ResultVal<bool> ShouldWait() override { 32 bool ShouldWait() override {
33 return MakeResult<bool>(!signaled); 33 return !signaled;
34 } 34 }
35 35
36 ResultVal<bool> Acquire() override { 36 void Acquire() override {
37 return MakeResult<bool>(true); 37 _assert_msg_(Kernel, !ShouldWait(), "object unavailable!");
38 } 38 }
39}; 39};
40 40