diff options
| author | bunnei <bunneidev@gmail.com> | 2015-01-20 18:16:45 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-01-21 20:47:49 -0500 |
| commit | 15b6a4d9add6b260a2a1a84ab6228addced4f851 (patch) | |
| tree | e9934863ebd6483cabae0f6c280fab7e34eee32e /src/core/hle/kernel/timer.cpp | |
| parent | c68eb1569549ae49ae25c6c29cec2e10d8329f2d (diff) | |
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.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp index 1729cca0f7..8d9db92a4d 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!"); } }; |