diff options
| author | 2015-04-14 19:13:33 -0400 | |
|---|---|---|
| committer | 2015-04-14 19:13:33 -0400 | |
| commit | 46ea6944c3f637efee013ecc4ac65fd4985031a8 (patch) | |
| tree | 803f60fa0ed6e8c244f3e0b4eef30b37a61f8e2f /src/core/hle/kernel/timer.cpp | |
| parent | Merge pull request #683 from bunnei/thread-priority (diff) | |
| parent | Core_ARM11: Replace debug prints with our own logging functions in vfpsingle. (diff) | |
| download | yuzu-46ea6944c3f637efee013ecc4ac65fd4985031a8.tar.gz yuzu-46ea6944c3f637efee013ecc4ac65fd4985031a8.tar.xz yuzu-46ea6944c3f637efee013ecc4ac65fd4985031a8.zip | |
Merge pull request #697 from linkmauve/clang<3
Fix a few warnings as reported by clang 3.6
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 610e26a3c..1ec2a4b10 100644 --- a/src/core/hle/kernel/timer.cpp +++ b/src/core/hle/kernel/timer.cpp | |||
| @@ -66,7 +66,7 @@ static void TimerCallback(u64 timer_handle, int cycles_late) { | |||
| 66 | SharedPtr<Timer> timer = timer_callback_handle_table.Get<Timer>(static_cast<Handle>(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 %08lX", timer_handle); |
| 70 | return; | 70 | return; |
| 71 | } | 71 | } |
| 72 | 72 | ||