diff options
| author |  Yuri Kunde Schlesner | 2015-07-25 12:50:32 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2015-07-25 12:50:32 -0700 |
| commit | 9a0f9f12cd867c8fa033fa8e5e564bda2eaf2db1 (patch) | |
| tree | 732bc1b978397a05fab07d5443fe05534ea39b37 /src/core/core_timing.cpp | |
| parent | Merge pull request #981 from Subv/checkboxes (diff) | |
| parent | Vertex Shader : Undo casting (diff) | |
| download | yuzu-9a0f9f12cd867c8fa033fa8e5e564bda2eaf2db1.tar.gz yuzu-9a0f9f12cd867c8fa033fa8e5e564bda2eaf2db1.tar.xz yuzu-9a0f9f12cd867c8fa033fa8e5e564bda2eaf2db1.zip | |
Merge pull request #892 from zawata/another-warning-fixes
Yet More Warning Fixes
Diffstat (limited to 'src/core/core_timing.cpp')
| -rw-r--r-- | src/core/core_timing.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index 72006a53e..20f2da0fe 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp | |||
| @@ -502,7 +502,7 @@ void Advance() { | |||
| 502 | Core::g_app_core->down_count += diff; | 502 | Core::g_app_core->down_count += diff; |
| 503 | } | 503 | } |
| 504 | if (advance_callback) | 504 | if (advance_callback) |
| 505 | advance_callback(cycles_executed); | 505 | advance_callback(static_cast<int>(cycles_executed)); |
| 506 | } | 506 | } |
| 507 | 507 | ||
| 508 | void LogPendingEvents() { | 508 | void LogPendingEvents() { |