archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-14 18:58:36 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Compilation fix

Browse source
This commit is contained in:
Nekotekina 2015-01-19 19:59:07 +03:00
parent 1629feb15e
commit 6ec6303933
1 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

25
rpcs3/Emu/Memory/vm_ptr.h
View file

@ -410,7 +410,8 @@ namespace vm
{ {
static bptrl make(AT addr) static bptrl make(AT addr)
{ {
return (bptrl&)_ptr_base<T, lvl, typename to_be_t<AT>::type>::make(convert_le_be<typename to_be_t<AT>::type>(addr)); auto res = _ptr_base<T, lvl, typename to_be_t<AT>::type>::make(convert_le_be<typename to_be_t<AT>::type>(addr));
return (bptrl&)res;
} }
using _ptr_base<T, lvl, typename to_be_t<AT>::type>::operator=; using _ptr_base<T, lvl, typename to_be_t<AT>::type>::operator=;
@ -421,7 +422,8 @@ namespace vm
{ {
static bptrb make(AT addr) static bptrb make(AT addr)
{ {
return (bptrb&)_ptr_base<typename to_be_t<T>::type, lvl, typename to_be_t<AT>::type>::make(convert_le_be<typename to_be_t<AT>::type>(addr)); auto res = _ptr_base<typename to_be_t<T>::type, lvl, typename to_be_t<AT>::type>::make(convert_le_be<typename to_be_t<AT>::type>(addr));
return (bptrb&)res;
} }
using _ptr_base<typename to_be_t<T>::type, lvl, typename to_be_t<AT>::type>::operator=; using _ptr_base<typename to_be_t<T>::type, lvl, typename to_be_t<AT>::type>::operator=;
@ -432,7 +434,8 @@ namespace vm
{ {
static lptrb make(AT addr) static lptrb make(AT addr)
{ {
return (lptrb&)_ptr_base<typename to_be_t<T>::type, lvl, AT>::make(addr); auto res = _ptr_base<typename to_be_t<T>::type, lvl, AT>::make(addr);
return (lptrb&)res;
} }
using _ptr_base<typename to_be_t<T>::type, lvl, AT>::operator=; using _ptr_base<typename to_be_t<T>::type, lvl, AT>::operator=;
@ -443,7 +446,8 @@ namespace vm
{ {
static lptrl make(AT addr) static lptrl make(AT addr)
{ {
return (lptrl&)_ptr_base<T, lvl, AT>::make(addr); auto res = _ptr_base<T, lvl, AT>::make(addr);
return (lptrl&)res;
} }
using _ptr_base<T, lvl, AT>::operator=; using _ptr_base<T, lvl, AT>::operator=;
@ -459,12 +463,13 @@ namespace vm
{ {
static ptr make(AT addr) static ptr make(AT addr)
{ {
return (ptr&)lptrb<T, lvl, AT>::make(addr); auto res = lptrb<T, lvl, AT>::make(addr);
return (ptr&)res;
} }
vm::ps3::bptr<T, lvl, AT> to_be() const vm::ps3::bptr<T, lvl, AT> to_be() const
{ {
return vm::ps3::bptr<T, lvl, AT>::make(addr()); return vm::ps3::bptr<T, lvl, AT>::make(this->addr());
} }
using lptrb<T, lvl, AT>::operator=; using lptrb<T, lvl, AT>::operator=;
@ -475,12 +480,13 @@ namespace vm
{ {
static bptr make(AT addr) static bptr make(AT addr)
{ {
return (bptr&)bptrb<T, lvl, AT>::make(addr); auto res = bptrb<T, lvl, AT>::make(addr);
return (bptr&)res;
} }
vm::ps3::ptr<T, lvl, AT> to_le() const vm::ps3::ptr<T, lvl, AT> to_le() const
{ {
return vm::ps3::ptr<T, lvl, AT>::make(addr()); return vm::ps3::ptr<T, lvl, AT>::make(this->addr());
} }
using bptrb<T, lvl, AT>::operator=; using bptrb<T, lvl, AT>::operator=;
@ -494,7 +500,8 @@ namespace vm
{ {
static ptr make(AT addr) static ptr make(AT addr)
{ {
return (ptr&)lptrl<T, lvl, AT>::make(addr); auto res = lptrl<T, lvl, AT>::make(addr);
return (ptr&)res;
} }
using lptrl<T, lvl, AT>::operator=; using lptrl<T, lvl, AT>::operator=;