From 31c71b4a4863b4cbd27cc2b95b2a5e2db7ff8e95 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Sun, 2 Nov 2014 04:18:02 +0300 Subject: [PATCH] Compilation fix --- rpcs3/Emu/ARMv7/Modules/sceLibc.cpp | 4 ++-- rpcs3/Emu/ARMv7/PSVFuncList.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp index 2f1f25617d..c02a2b5f1f 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp @@ -26,7 +26,7 @@ namespace sce_libc_func } } -psv_log_base& sceLibc = []() +psv_log_base& sceLibc = []() -> psv_log_base& { psv_log_base* module = new psv_log_base("sceLibc"); @@ -326,5 +326,5 @@ psv_log_base& sceLibc = []() //REG_FUNC(0x7D35108B, _FSnan); //REG_FUNC(0x48AEEF2A, _LSnan); - return std::move(*module); + return *module; }(); diff --git a/rpcs3/Emu/ARMv7/PSVFuncList.cpp b/rpcs3/Emu/ARMv7/PSVFuncList.cpp index 4041d23c00..5d80b173a7 100644 --- a/rpcs3/Emu/ARMv7/PSVFuncList.cpp +++ b/rpcs3/Emu/ARMv7/PSVFuncList.cpp @@ -23,11 +23,11 @@ psv_func* get_psv_func_by_nid(u32 nid) u32 get_psv_func_index(psv_func* func) { - u32 res = func - g_psv_func_list.data(); + auto res = func - g_psv_func_list.data(); - assert(res < g_psv_func_list.size()); + assert((size_t)res < g_psv_func_list.size()); - return res; + return (u32)res; } void execute_psv_func_by_index(ARMv7Thread& CPU, u32 index)