diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/linux/dump_symbols.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/common/linux/dump_symbols.cc b/src/common/linux/dump_symbols.cc index cd059ba8..ed533b43 100644 --- a/src/common/linux/dump_symbols.cc +++ b/src/common/linux/dump_symbols.cc @@ -226,7 +226,7 @@ class DumperLineToModule: public DwarfCUToModule::LineToModuleFunctor { explicit DumperLineToModule(dwarf2reader::ByteReader *byte_reader) : byte_reader_(byte_reader) { } void operator()(const char *program, uint64 length, - Module *module, vector<Module::Line> *lines) { + Module *module, std::vector<Module::Line> *lines) { DwarfLineToModule handler(module, lines); dwarf2reader::LineInfo parser(program, length, byte_reader_, &handler); parser.Start(); @@ -235,7 +235,7 @@ class DumperLineToModule: public DwarfCUToModule::LineToModuleFunctor { dwarf2reader::ByteReader *byte_reader_; }; -static bool LoadDwarf(const string &dwarf_filename, +static bool LoadDwarf(const std::string &dwarf_filename, const ElfW(Ehdr) *elf_header, const bool big_endian, Module *module) { @@ -253,7 +253,7 @@ static bool LoadDwarf(const string &dwarf_filename, const ElfW(Shdr) *section_names = sections + elf_header->e_shstrndx; for (int i = 0; i < num_sections; i++) { const ElfW(Shdr) *section = §ions[i]; - string name = reinterpret_cast<const char *>(section_names->sh_offset + std::string name = reinterpret_cast<const char *>(section_names->sh_offset + section->sh_name); const char *contents = reinterpret_cast<const char *>(section->sh_offset); uint64 length = section->sh_size; @@ -292,7 +292,7 @@ static bool LoadDwarf(const string &dwarf_filename, // success, or false if we don't recognize HEADER's machine // architecture. static bool DwarfCFIRegisterNames(const ElfW(Ehdr) *elf_header, - vector<string> *register_names) { + std::vector<std::string> *register_names) { switch (elf_header->e_machine) { case EM_386: *register_names = DwarfCFIToModule::RegisterNames::I386(); @@ -308,7 +308,7 @@ static bool DwarfCFIRegisterNames(const ElfW(Ehdr) *elf_header, } } -static bool LoadDwarfCFI(const string &dwarf_filename, +static bool LoadDwarfCFI(const std::string &dwarf_filename, const ElfW(Ehdr) *elf_header, const char *section_name, const ElfW(Shdr) *section, @@ -319,7 +319,7 @@ static bool LoadDwarfCFI(const string &dwarf_filename, Module *module) { // Find the appropriate set of register names for this file's // architecture. - vector<string> register_names; + std::vector<std::string> register_names; if (!DwarfCFIRegisterNames(elf_header, ®ister_names)) { fprintf(stderr, "%s: unrecognized ELF machine architecture '%d';" " cannot convert DWARF call frame information\n", |