diff options
| author |  Subv | 2015-02-01 15:31:21 -0500 |
|---|---|---|
| committer | Subv | 2015-02-12 09:25:35 -0500 |
| commit | 8e2b248e05c99c9cf505a351bc9234cedd5fa3b4 (patch) | |
| tree | 05f18714a93d28999c259f4cd86c261deaf659b2 /src/core/hle/kernel/timer.cpp | |
| parent | Merge pull request #384 from neobrain/vertex_shader_debugger (diff) | |
| download | yuzu-8e2b248e05c99c9cf505a351bc9234cedd5fa3b4.tar.gz yuzu-8e2b248e05c99c9cf505a351bc9234cedd5fa3b4.tar.xz yuzu-8e2b248e05c99c9cf505a351bc9234cedd5fa3b4.zip | |
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() { | |||
| 63 | 63 | ||
| 64 | /// The timer callback event, called when a timer is fired | 64 | /// The timer callback event, called when a timer is fired |
| 65 | static void TimerCallback(u64 timer_handle, int cycles_late) { | 65 | static 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); |