summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2015-07-25 12:50:32 -0700
committerGravatar Yuri Kunde Schlesner2015-07-25 12:50:32 -0700
commit9a0f9f12cd867c8fa033fa8e5e564bda2eaf2db1 (patch)
tree732bc1b978397a05fab07d5443fe05534ea39b37 /src/core
parentMerge pull request #981 from Subv/checkboxes (diff)
parentVertex Shader : Undo casting (diff)
downloadyuzu-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')
-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 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
508void LogPendingEvents() { 508void 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
191 *pos = (addr); 191 *pos = (addr);
192 break; 192 break;
193 case 1: 193 case 1:
194 *pos = (addr - in_addr); 194 *pos = static_cast<u32>(addr - in_addr);
195 break; 195 break;
196 default: 196 default:
197 break; //this should never happen 197 break; //this should never happen