citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Merge pull request #1373 from lioncash/cast 

elf: Don't cast away const
This commit is contained in:
Yuri Kunde Schlesner 2016-01-25 00:41:32 -08:00
parent cfaacc07dc a89e32b157
commit 8b3994e9e4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/loader/elf.cpp
View File

@ -250,7 +250,7 @@ const char *ElfReader::GetSectionName(int section) const {
return nullptr; return nullptr;
int name_offset = sections[section].sh_name; int name_offset = sections[section].sh_name;
const char* ptr = (char*)GetSectionDataPtr(header->e_shstrndx); const char* ptr = reinterpret_cast<const char*>(GetSectionDataPtr(header->e_shstrndx));
if (ptr) if (ptr)
return ptr + name_offset; return ptr + name_offset;
@ -347,10 +347,10 @@ bool ElfReader::LoadSymbols() {
SectionID sec = GetSectionByName(".symtab"); SectionID sec = GetSectionByName(".symtab");
if (sec != -1) { if (sec != -1) {
int stringSection = sections[sec].sh_link; int stringSection = sections[sec].sh_link;
const char *stringBase = (const char *)GetSectionDataPtr(stringSection); const char *stringBase = reinterpret_cast<const char*>(GetSectionDataPtr(stringSection));
//We have a symbol table! //We have a symbol table!
Elf32_Sym* symtab = (Elf32_Sym *)(GetSectionDataPtr(sec)); const Elf32_Sym* symtab = reinterpret_cast<const Elf32_Sym*>(GetSectionDataPtr(sec));
unsigned int numSymbols = sections[sec].sh_size / sizeof(Elf32_Sym); unsigned int numSymbols = sections[sec].sh_size / sizeof(Elf32_Sym);
for (unsigned sym = 0; sym < numSymbols; sym++) { for (unsigned sym = 0; sym < numSymbols; sym++) {
int size = symtab[sym].st_size; int size = symtab[sym].st_size;