summaryrefslogtreecommitdiff
path: root/tools/obj2yaml/coff2yaml.cpp
diff options
context:
space:
mode:
authorAlexey Samsonov <samsonov@google.com>2014-03-18 06:53:02 +0000
committerAlexey Samsonov <samsonov@google.com>2014-03-18 06:53:02 +0000
commit5b645797db05926bffdd6214e94a527267445cc9 (patch)
tree654d72ff2ee5049fd99780d13934c64cb1bd76bf /tools/obj2yaml/coff2yaml.cpp
parent3bdef4b6dc8098d86c74c445c8478c28598a3a05 (diff)
[C++11] Change the interface of getCOFF{Section,Relocation,Symbol} to make it work with range-based for loops.
Reviewers: ruiu Reviewed By: ruiu CC: llvm-commits Differential Revision: http://llvm-reviews.chandlerc.com/D3097 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@204120 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/obj2yaml/coff2yaml.cpp')
-rw-r--r--tools/obj2yaml/coff2yaml.cpp17
1 files changed, 7 insertions, 10 deletions
diff --git a/tools/obj2yaml/coff2yaml.cpp b/tools/obj2yaml/coff2yaml.cpp
index 8fdd4aee0c9..6cf79aeabc7 100644
--- a/tools/obj2yaml/coff2yaml.cpp
+++ b/tools/obj2yaml/coff2yaml.cpp
@@ -51,9 +51,8 @@ void COFFDumper::dumpHeader(const object::coff_file_header *Header) {
void COFFDumper::dumpSections(unsigned NumSections) {
std::vector<COFFYAML::Section> &Sections = YAMLObj.Sections;
- for (object::section_iterator iter = Obj.section_begin();
- iter != Obj.section_end(); ++iter) {
- const object::coff_section *Sect = Obj.getCOFFSection(iter);
+ for (const auto &Section : Obj.sections()) {
+ const object::coff_section *Sect = Obj.getCOFFSection(Section);
COFFYAML::Section Sec;
Sec.Name = Sect->Name; // FIXME: check the null termination!
uint32_t Characteristics = Sect->Characteristics;
@@ -65,11 +64,10 @@ void COFFDumper::dumpSections(unsigned NumSections) {
Sec.SectionData = object::yaml::BinaryRef(sectionData);
std::vector<COFFYAML::Relocation> Relocations;
- for (object::relocation_iterator rIter = iter->relocation_begin();
- rIter != iter->relocation_end(); ++rIter) {
- const object::coff_relocation *reloc = Obj.getCOFFRelocation(rIter);
+ for (const auto &Reloc : Section.relocations()) {
+ const object::coff_relocation *reloc = Obj.getCOFFRelocation(Reloc);
COFFYAML::Relocation Rel;
- object::symbol_iterator Sym = rIter->getSymbol();
+ object::symbol_iterator Sym = Reloc.getSymbol();
Sym->getName(Rel.SymbolName);
Rel.VirtualAddress = reloc->VirtualAddress;
Rel.Type = reloc->Type;
@@ -82,9 +80,8 @@ void COFFDumper::dumpSections(unsigned NumSections) {
void COFFDumper::dumpSymbols(unsigned NumSymbols) {
std::vector<COFFYAML::Symbol> &Symbols = YAMLObj.Symbols;
- for (object::symbol_iterator iter = Obj.symbol_begin();
- iter != Obj.symbol_end(); ++iter) {
- const object::coff_symbol *Symbol = Obj.getCOFFSymbol(iter);
+ for (const auto &S : Obj.symbols()) {
+ const object::coff_symbol *Symbol = Obj.getCOFFSymbol(S);
COFFYAML::Symbol Sym;
Obj.getSymbolName(Symbol, Sym.Name);
Sym.SimpleType = COFF::SymbolBaseType(Symbol->getBaseType());