aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/core_timing.cpp2
-rw-r--r--src/core/loader/3dsx.cpp2
2 files changed, 2 insertions, 2 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() {
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<u32>(addr - in_addr);
break;
default:
break; //this should never happen