summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/timer.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-01-21 00:16:45 +0100
committerbunnei <bunneidev@gmail.com>2015-01-22 02:47:49 +0100
commit15b6a4d9add6b260a2a1a84ab6228addced4f851 (patch)
treee9934863ebd6483cabae0f6c280fab7e34eee32e /src/core/hle/kernel/timer.cpp
parentWaitObject: Renamed "Wait" to "ShouldWait", made "ShouldWait" and "Acquire" pure virtual. (diff)
downloadyuzu-15b6a4d9add6b260a2a1a84ab6228addced4f851.tar
yuzu-15b6a4d9add6b260a2a1a84ab6228addced4f851.tar.gz
yuzu-15b6a4d9add6b260a2a1a84ab6228addced4f851.tar.bz2
yuzu-15b6a4d9add6b260a2a1a84ab6228addced4f851.tar.lz
yuzu-15b6a4d9add6b260a2a1a84ab6228addced4f851.tar.xz
yuzu-15b6a4d9add6b260a2a1a84ab6228addced4f851.tar.zst
yuzu-15b6a4d9add6b260a2a1a84ab6228addced4f851.zip
Diffstat (limited to '')
-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:
u64 initial_delay; ///< The delay until the timer fires for the first time
u64 interval_delay; ///< The delay until the timer fires after the first time
- ResultVal<bool> ShouldWait() override {
- return MakeResult<bool>(!signaled);
+ bool ShouldWait() override {
+ return !signaled;
}
- ResultVal<bool> Acquire() override {
- return MakeResult<bool>(true);
+ void Acquire() override {
+ _assert_msg_(Kernel, !ShouldWait(), "object unavailable!");
}
};