From 1be1ff23a9f6587d0867c11093d153e16f4b650c Mon Sep 17 00:00:00 2001 From: zawata Date: Sat, 27 Jun 2015 19:29:21 -0700 Subject: Core : Fix Conversion Warnings --- src/core/core_timing.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core') 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(cycles_executed)); } void LogPendingEvents() { -- cgit v1.2.3 From 972dccc3f692adc113250d62531a774fecb9389c Mon Sep 17 00:00:00 2001 From: zawata Date: Mon, 29 Jun 2015 10:21:40 -0700 Subject: Core : Change variable type and fix various warnings --- src/core/loader/3dsx.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core') diff --git a/src/core/loader/3dsx.cpp b/src/core/loader/3dsx.cpp index d043fa9b..530837d0 100644 --- a/src/core/loader/3dsx.cpp +++ b/src/core/loader/3dsx.cpp @@ -191,7 +191,7 @@ static THREEDSX_Error Load3DSXFile(FileUtil::IOFile& file, u32 base_addr, Shared *pos = (addr); break; case 1: - *pos = (addr - in_addr); + *pos = static_cast(addr - in_addr); break; default: break; //this should never happen -- cgit v1.2.3