diff options
| author |  bunnei | 2015-01-20 17:41:12 -0500 |
|---|---|---|
| committer | bunnei | 2015-01-21 20:47:49 -0500 |
| commit | c68eb1569549ae49ae25c6c29cec2e10d8329f2d (patch) | |
| tree | 4a8683aac99095884acaf488aa4d059f861138b3 /src/core/hle/kernel/timer.cpp | |
| parent | Event: Fix implementation of "non-sticky" events. (diff) | |
| download | yuzu-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/timer.cpp')
| -rw-r--r-- | src/core/hle/kernel/timer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp index 62bdf07c7..1729cca0f 100644 --- a/src/core/hle/kernel/timer.cpp +++ b/src/core/hle/kernel/timer.cpp | |||
| @@ -29,7 +29,7 @@ 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> Wait() override { | 32 | ResultVal<bool> ShouldWait() override { |
| 33 | return MakeResult<bool>(!signaled); | 33 | return MakeResult<bool>(!signaled); |
| 34 | } | 34 | } |
| 35 | 35 | ||