Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compilation fix

Browse Source
This commit is contained in:
Nekotekina
2014-09-02 05:14:24 +04:00
parent b952017a3a
commit 1626df7e46
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/Memory/vm_ptr.h
-5
View File
@@ -448,11 +448,6 @@ namespace vm
return (bptr&)addr; return (bptr&)addr;
} }
operator ptr<T, lvl, AT>() const
{
return ptr<T, lvl, AT>::make(addr());
}
using bptrb<T, lvl, AT>::operator=; using bptrb<T, lvl, AT>::operator=;
}; };
} }
rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp
+4 -4
View File
@@ -340,9 +340,9 @@ int cellSaveDataListSave2(u32 version, vm::ptr<CellSaveDataSetList> setList, vm:
return CELL_SAVEDATA_ERROR_CBRESULT; return CELL_SAVEDATA_ERROR_CBRESULT;
} }
setSaveDataList(saveEntries, listSet->fixedList, listSet->fixedListNum); setSaveDataList(saveEntries, vm::ptr<CellSaveDataDirList>::make(listSet->fixedList.addr()), listSet->fixedListNum);
if (listSet->newData) if (listSet->newData)
addNewSaveDataEntry(saveEntries, listSet->newData); addNewSaveDataEntry(saveEntries, vm::ptr<CellSaveDataListNewData>::make(listSet->newData.addr()));
if (saveEntries.size() == 0) { if (saveEntries.size() == 0) {
cellSysutil->Warning("cellSaveDataListSave2: No save entries found!"); // TODO: Find a better way to handle this error cellSysutil->Warning("cellSaveDataListSave2: No save entries found!"); // TODO: Find a better way to handle this error
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
@@ -425,9 +425,9 @@ int cellSaveDataListLoad2(u32 version, vm::ptr<CellSaveDataSetList> setList, vm:
return CELL_SAVEDATA_ERROR_CBRESULT; return CELL_SAVEDATA_ERROR_CBRESULT;
} }
setSaveDataList(saveEntries, listSet->fixedList, listSet->fixedListNum); setSaveDataList(saveEntries, vm::ptr<CellSaveDataDirList>::make(listSet->fixedList.addr()), listSet->fixedListNum);
if (listSet->newData) if (listSet->newData)
addNewSaveDataEntry(saveEntries, listSet->newData); addNewSaveDataEntry(saveEntries, vm::ptr<CellSaveDataListNewData>::make(listSet->newData.addr()));
if (saveEntries.size() == 0) { if (saveEntries.size() == 0) {
cellSysutil->Warning("cellSaveDataListLoad2: No save entries found!"); // TODO: Find a better way to handle this error cellSysutil->Warning("cellSaveDataListLoad2: No save entries found!"); // TODO: Find a better way to handle this error
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;