summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/timer.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2015-02-14 15:50:26 -0500
committerGravatar bunnei2015-02-14 15:50:26 -0500
commit12181c8a64678e73281e893b6ba108d5a125c1aa (patch)
tree831883189eb5c846b619c20e22e1015c5c140c63 /src/core/hle/kernel/timer.cpp
parentMerge pull request #572 from lioncash/prototypes (diff)
parentBuild: Fixed some warnings (diff)
downloadyuzu-12181c8a64678e73281e893b6ba108d5a125c1aa.tar.gz
yuzu-12181c8a64678e73281e893b6ba108d5a125c1aa.tar.xz
yuzu-12181c8a64678e73281e893b6ba108d5a125c1aa.zip
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.cpp2
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() {
63 63
64/// The timer callback event, called when a timer is fired 64/// The timer callback event, called when a timer is fired
65static void TimerCallback(u64 timer_handle, int cycles_late) { 65static void TimerCallback(u64 timer_handle, int cycles_late) {
66 SharedPtr<Timer> timer = timer_callback_handle_table.Get<Timer>(timer_handle); 66 SharedPtr<Timer> timer = timer_callback_handle_table.Get<Timer>(static_cast<Handle>(timer_handle));
67 67
68 if (timer == nullptr) { 68 if (timer == nullptr) {
69 LOG_CRITICAL(Kernel, "Callback fired for invalid timer %08X", timer_handle); 69 LOG_CRITICAL(Kernel, "Callback fired for invalid timer %08X", timer_handle);