aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/core_timing.cpp
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner <yuriks@yuriks.net>2015-07-25 12:50:32 -0700
committerGravatar Yuri Kunde Schlesner <yuriks@yuriks.net>2015-07-25 12:50:32 -0700
commit9a0f9f12cd867c8fa033fa8e5e564bda2eaf2db1 (patch)
tree732bc1b978397a05fab07d5443fe05534ea39b37 /src/core/core_timing.cpp
parent43e1f56ff5e43193a124a965cdcae9d7348306fc (diff)
parent6933a50aeb8ea6a2ff2c4d88068214b934771eab (diff)
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.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index 72006a53..20f2da0f 100644
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@@ -502,7 +502,7 @@ void Advance() {
Core::g_app_core->down_count += diff;
}
if (advance_callback)
- advance_callback(cycles_executed);
+ advance_callback(static_cast<int>(cycles_executed));
}
void LogPendingEvents() {