diff options
| author | bunnei <bunneidev@gmail.com> | 2015-02-14 15:50:26 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-02-14 15:50:26 -0500 |
| commit | 12181c8a64678e73281e893b6ba108d5a125c1aa (patch) | |
| tree | 831883189eb5c846b619c20e22e1015c5c140c63 /src/core/hle/kernel/timer.cpp | |
| parent | 29a9e4ac25504bee82f273184a1afcc88a3e61e1 (diff) | |
| parent | 8e2b248e05c99c9cf505a351bc9234cedd5fa3b4 (diff) | |
Merge pull request #529 from Subv/master
Build: Fixed some warnings
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 aa0afb796..610e26a3c 100644 --- a/src/core/hle/kernel/timer.cpp +++ b/src/core/hle/kernel/timer.cpp @@ -63,7 +63,7 @@ void Timer::Clear() { /// The timer callback event, called when a timer is fired static void TimerCallback(u64 timer_handle, int cycles_late) { - SharedPtr<Timer> timer = timer_callback_handle_table.Get<Timer>(timer_handle); + SharedPtr<Timer> timer = timer_callback_handle_table.Get<Timer>(static_cast<Handle>(timer_handle)); if (timer == nullptr) { LOG_CRITICAL(Kernel, "Callback fired for invalid timer %08X", timer_handle); |