summaryrefslogtreecommitdiff
path: root/tools/obj2yaml/coff2yaml.cpp
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2013-04-20 03:16:59 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2013-04-20 03:16:59 +0000
commitdaf0f44e3161dd065768412544d42de3227c9c3a (patch)
tree873fe1c6ad5efaa69bdb8791ea43560ef4504e96 /tools/obj2yaml/coff2yaml.cpp
parent9e39d0bc2092f97c531591737af8abda48211169 (diff)
downloadllvm-daf0f44e3161dd065768412544d42de3227c9c3a.tar.gz
llvm-daf0f44e3161dd065768412544d42de3227c9c3a.tar.bz2
llvm-daf0f44e3161dd065768412544d42de3227c9c3a.tar.xz
Rename obj2yaml local namespace to avoid conflicts with llvm::yaml.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@179922 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/obj2yaml/coff2yaml.cpp')
-rw-r--r--tools/obj2yaml/coff2yaml.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/obj2yaml/coff2yaml.cpp b/tools/obj2yaml/coff2yaml.cpp
index 349d0c1756..203754c11c 100644
--- a/tools/obj2yaml/coff2yaml.cpp
+++ b/tools/obj2yaml/coff2yaml.cpp
@@ -243,7 +243,7 @@ static raw_ostream &yamlCOFFHeader(const object::coff_file_header *Header,
Out << " Machine: ";
Out << nameLookup(MachineTypePairs, Header->Machine, "# Unknown_MachineTypes")
<< " # (";
- return yaml::writeHexNumber(Out, Header->Machine) << ")\n\n";
+ return objyaml::writeHexNumber(Out, Header->Machine) << ")\n\n";
}
@@ -267,12 +267,12 @@ static raw_ostream &yamlCOFFSections(object::COFFObjectFile &Obj,
<< ", ";
writeBitMask(Out, SectionCharacteristicsPairs2, sect->Characteristics);
Out << "] # ";
- yaml::writeHexNumber(Out, sect->Characteristics) << '\n';
+ objyaml::writeHexNumber(Out, sect->Characteristics) << '\n';
ArrayRef<uint8_t> sectionData;
Obj.getSectionContents(sect, sectionData);
Out << " SectionData: ";
- yaml::writeHexStream(Out, sectionData) << '\n';
+ objyaml::writeHexStream(Out, sectionData) << '\n';
if (iter->begin_relocations() != iter->end_relocations())
Out << " Relocations:\n";
for (object::relocation_iterator rIter = iter->begin_relocations();
@@ -281,7 +281,7 @@ static raw_ostream &yamlCOFFSections(object::COFFObjectFile &Obj,
Out << " - !Relocation\n";
Out << " VirtualAddress: " ;
- yaml::writeHexNumber(Out, reloc->VirtualAddress) << '\n';
+ objyaml::writeHexNumber(Out, reloc->VirtualAddress) << '\n';
Out << " SymbolTableIndex: " << reloc->SymbolTableIndex << '\n';
Out << " Type: "
<< nameLookup(RelocationTypeX86Pairs, reloc->Type) << '\n';
@@ -334,7 +334,7 @@ static raw_ostream& yamlCOFFSymbols(object::COFFObjectFile &Obj,
Out << " NumberOfAuxSymbols: "
<< (int) symbol->NumberOfAuxSymbols << '\n';
Out << " AuxillaryData: ";
- yaml::writeHexStream(Out, aux);
+ objyaml::writeHexStream(Out, aux);
}
Out << '\n';