From c5d41fd812d7eb1a04f36b76c08fe971cee0868c Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sun, 24 Mar 2019 18:11:32 -0400
Subject: core/core_timing: Make callback parameters consistent
In some cases, our callbacks were using s64 as a parameter, and in other
cases, they were using an int, which is inconsistent.
To make all callbacks consistent, we can just use an s64 as the type for
late cycles, given it gets rid of the need to cast internally.
While we're at it, also resolve some signed/unsigned conversions that
were occurring related to the callback registration.
---
src/core/core_timing.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src/core/core_timing.cpp')
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index a0dd5db242..41adb23022 100644
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@@ -186,7 +186,7 @@ void CoreTiming::Advance() {
Event evt = std::move(event_queue.front());
std::pop_heap(event_queue.begin(), event_queue.end(), std::greater<>());
event_queue.pop_back();
- evt.type->callback(evt.userdata, static_cast<int>(global_timer - evt.time));
+ evt.type->callback(evt.userdata, global_timer - evt.time);
}
is_global_timer_sane = false;
--
cgit v1.2.3-70-g09d2