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

Merge pull request #133 from bagedevimo/fix

Browse Source 
Fixes invalid conversion from wxStringConst, to std::string under gcc-4-8
This commit is contained in:
Alexandro Sánchez Bach
2014-03-29 07:05:57 +01:00
parent 503c24453a 6141c33630
commit a7fbd5c9b6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp
+2 -2
View File
@@ -102,7 +102,7 @@ int cellSaveDataListSave2(u32 version, mem_ptr_t<CellSaveDataSetList> setList, m
if(!dir.IsOpened()) if(!dir.IsOpened())
return CELL_SAVEDATA_ERROR_INTERNAL; return CELL_SAVEDATA_ERROR_INTERNAL;
std::string dirNamePrefix = Memory.ReadString(setList->dirNamePrefix_addr).mb_str(); std::string dirNamePrefix = std::string(Memory.ReadString(setList->dirNamePrefix_addr).mb_str());
std::vector<SaveDataListEntry> saveEntries; std::vector<SaveDataListEntry> saveEntries;
for(const DirEntryInfo* entry = dir.Read(); entry; entry = dir.Read()) for(const DirEntryInfo* entry = dir.Read(); entry; entry = dir.Read())
{ {
@@ -165,7 +165,7 @@ int cellSaveDataListLoad2(u32 version, mem_ptr_t<CellSaveDataSetList> setList, m
if(!dir.IsOpened()) if(!dir.IsOpened())
return CELL_SAVEDATA_ERROR_INTERNAL; return CELL_SAVEDATA_ERROR_INTERNAL;
std::string dirNamePrefix = Memory.ReadString(setList->dirNamePrefix_addr).mb_str(); std::string dirNamePrefix = std::string(Memory.ReadString(setList->dirNamePrefix_addr).mb_str());
std::vector<SaveDataListEntry> saveEntries; std::vector<SaveDataListEntry> saveEntries;
for(const DirEntryInfo* entry = dir.Read(); entry; entry = dir.Read()) for(const DirEntryInfo* entry = dir.Read(); entry; entry = dir.Read())
{ {