Fixes some cast warnings, partial port of citra #3064 (#106)

* Fixes some cast warnings, partially fixes citra #3064

* Converted casts to uint32_t to u32

* Ran clang-format
This commit is contained in:
River City Ransomware 2018-01-19 18:01:41 -05:00 committed by bunnei
parent 1a1bb5810a
commit 39827d573a
6 changed files with 22 additions and 21 deletions

View file

@ -122,7 +122,7 @@ u64 GetTicks() {
}
void AddTicks(u64 ticks) {
downcount -= ticks;
downcount -= static_cast<int>(ticks);
}
u64 GetIdleTicks() {
@ -208,7 +208,7 @@ void Advance() {
Event evt = std::move(event_queue.front());
std::pop_heap(event_queue.begin(), event_queue.end(), std::greater<Event>());
event_queue.pop_back();
evt.type->callback(evt.userdata, global_timer - evt.time);
evt.type->callback(evt.userdata, static_cast<int>(global_timer - evt.time));
}
is_global_timer_sane = false;