diff options
| author | 2018-01-19 18:01:41 -0500 | |
|---|---|---|
| committer | 2018-01-19 18:01:41 -0500 | |
| commit | dd62f125c359b37d71be6ccf873177c1a108d015 (patch) | |
| tree | 0d543402a25f4ba701dc547808b289daa0fc325b /src/core/core_timing.cpp | |
| parent | Merge pull request #112 from Rozelette/master (diff) | |
| download | yuzu-dd62f125c359b37d71be6ccf873177c1a108d015.tar.gz yuzu-dd62f125c359b37d71be6ccf873177c1a108d015.tar.xz yuzu-dd62f125c359b37d71be6ccf873177c1a108d015.zip | |
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
Diffstat (limited to 'src/core/core_timing.cpp')
| -rw-r--r-- | src/core/core_timing.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index a0656f0a8..9e1bf2d0e 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp | |||
| @@ -122,7 +122,7 @@ u64 GetTicks() { | |||
| 122 | } | 122 | } |
| 123 | 123 | ||
| 124 | void AddTicks(u64 ticks) { | 124 | void AddTicks(u64 ticks) { |
| 125 | downcount -= ticks; | 125 | downcount -= static_cast<int>(ticks); |
| 126 | } | 126 | } |
| 127 | 127 | ||
| 128 | u64 GetIdleTicks() { | 128 | u64 GetIdleTicks() { |
| @@ -208,7 +208,7 @@ void Advance() { | |||
| 208 | Event evt = std::move(event_queue.front()); | 208 | Event evt = std::move(event_queue.front()); |
| 209 | std::pop_heap(event_queue.begin(), event_queue.end(), std::greater<Event>()); | 209 | std::pop_heap(event_queue.begin(), event_queue.end(), std::greater<Event>()); |
| 210 | event_queue.pop_back(); | 210 | event_queue.pop_back(); |
| 211 | evt.type->callback(evt.userdata, global_timer - evt.time); | 211 | evt.type->callback(evt.userdata, static_cast<int>(global_timer - evt.time)); |
| 212 | } | 212 | } |
| 213 | 213 | ||
| 214 | is_global_timer_sane = false; | 214 | is_global_timer_sane = false; |