diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-07-25 21:50:32 +0200 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-07-25 21:50:32 +0200 |
| commit | 9a0f9f12cd867c8fa033fa8e5e564bda2eaf2db1 (patch) | |
| tree | 732bc1b978397a05fab07d5443fe05534ea39b37 /src/core | |
| parent | Merge pull request #981 from Subv/checkboxes (diff) | |
| parent | Vertex Shader : Undo casting (diff) | |
| download | yuzu-9a0f9f12cd867c8fa033fa8e5e564bda2eaf2db1.tar yuzu-9a0f9f12cd867c8fa033fa8e5e564bda2eaf2db1.tar.gz yuzu-9a0f9f12cd867c8fa033fa8e5e564bda2eaf2db1.tar.bz2 yuzu-9a0f9f12cd867c8fa033fa8e5e564bda2eaf2db1.tar.lz yuzu-9a0f9f12cd867c8fa033fa8e5e564bda2eaf2db1.tar.xz yuzu-9a0f9f12cd867c8fa033fa8e5e564bda2eaf2db1.tar.zst yuzu-9a0f9f12cd867c8fa033fa8e5e564bda2eaf2db1.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/core_timing.cpp | 2 | ||||
| -rw-r--r-- | src/core/loader/3dsx.cpp | 2 |
2 files changed, 2 insertions, 2 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() { 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 d043fa9bd..530837d08 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 |