diff options
| author | Sebastian Valle <subv2112@gmail.com> | 2017-01-05 12:55:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-05 12:55:01 -0500 |
| commit | f20d872643654c574f73a263f032613046900f07 (patch) | |
| tree | 021284c18034d053c81928fa19d2efb6658451fb /src/core/hle/kernel/timer.h | |
| parent | 4650486b8ea8e3725e966a9f851a5e35e2764875 (diff) | |
| parent | dda4ec93bea089e3286e9a965378d9411f480acd (diff) | |
Merge pull request #2393 from Subv/synch
Kernel: Mutex priority inheritance and synchronization improvements.
Diffstat (limited to 'src/core/hle/kernel/timer.h')
| -rw-r--r-- | src/core/hle/kernel/timer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/timer.h b/src/core/hle/kernel/timer.h index 18ea0236b..2e3b31b23 100644 --- a/src/core/hle/kernel/timer.h +++ b/src/core/hle/kernel/timer.h @@ -39,8 +39,8 @@ 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 - bool ShouldWait() override; - void Acquire() override; + bool ShouldWait(Thread* thread) const override; + void Acquire(Thread* thread) override; /** * Starts the timer, with the specified initial delay and interval. |
