From 6ec63039335e14e3ed699412d483403019aedceb Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Mon, 19 Jan 2015 19:59:07 +0300 Subject: [PATCH] Compilation fix --- rpcs3/Emu/Memory/vm_ptr.h | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/rpcs3/Emu/Memory/vm_ptr.h b/rpcs3/Emu/Memory/vm_ptr.h index adc82349d0..8e7cc289c1 100644 --- a/rpcs3/Emu/Memory/vm_ptr.h +++ b/rpcs3/Emu/Memory/vm_ptr.h @@ -410,7 +410,8 @@ namespace vm { static bptrl make(AT addr) { - return (bptrl&)_ptr_base::type>::make(convert_le_be::type>(addr)); + auto res = _ptr_base::type>::make(convert_le_be::type>(addr)); + return (bptrl&)res; } using _ptr_base::type>::operator=; @@ -421,7 +422,8 @@ namespace vm { static bptrb make(AT addr) { - return (bptrb&)_ptr_base::type, lvl, typename to_be_t::type>::make(convert_le_be::type>(addr)); + auto res = _ptr_base::type, lvl, typename to_be_t::type>::make(convert_le_be::type>(addr)); + return (bptrb&)res; } using _ptr_base::type, lvl, typename to_be_t::type>::operator=; @@ -432,7 +434,8 @@ namespace vm { static lptrb make(AT addr) { - return (lptrb&)_ptr_base::type, lvl, AT>::make(addr); + auto res = _ptr_base::type, lvl, AT>::make(addr); + return (lptrb&)res; } using _ptr_base::type, lvl, AT>::operator=; @@ -443,7 +446,8 @@ namespace vm { static lptrl make(AT addr) { - return (lptrl&)_ptr_base::make(addr); + auto res = _ptr_base::make(addr); + return (lptrl&)res; } using _ptr_base::operator=; @@ -459,12 +463,13 @@ namespace vm { static ptr make(AT addr) { - return (ptr&)lptrb::make(addr); + auto res = lptrb::make(addr); + return (ptr&)res; } vm::ps3::bptr to_be() const { - return vm::ps3::bptr::make(addr()); + return vm::ps3::bptr::make(this->addr()); } using lptrb::operator=; @@ -475,12 +480,13 @@ namespace vm { static bptr make(AT addr) { - return (bptr&)bptrb::make(addr); + auto res = bptrb::make(addr); + return (bptr&)res; } vm::ps3::ptr to_le() const { - return vm::ps3::ptr::make(addr()); + return vm::ps3::ptr::make(this->addr()); } using bptrb::operator=; @@ -494,7 +500,8 @@ namespace vm { static ptr make(AT addr) { - return (ptr&)lptrl::make(addr); + auto res = lptrl::make(addr); + return (ptr&)res; } using lptrl::operator=;