diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-01-30 21:51:42 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-01-30 21:51:42 +0000 |
commit | fe7fa28084172f73aa0a29a65bf09152dc47a3ac (patch) | |
tree | a69c12ed283be5a9ddb5e87eb3c16e1aa6b1ad94 /tools/llvm-nm | |
parent | dafea158a7223491febdaedb969b1ec0e8680f56 (diff) | |
download | llvm-fe7fa28084172f73aa0a29a65bf09152dc47a3ac.tar.gz llvm-fe7fa28084172f73aa0a29a65bf09152dc47a3ac.tar.bz2 llvm-fe7fa28084172f73aa0a29a65bf09152dc47a3ac.tar.xz |
This file already has a "using namespace object;", use it.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@200493 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/llvm-nm')
-rw-r--r-- | tools/llvm-nm/llvm-nm.cpp | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/tools/llvm-nm/llvm-nm.cpp b/tools/llvm-nm/llvm-nm.cpp index a35c34e857..958a9af18e 100644 --- a/tools/llvm-nm/llvm-nm.cpp +++ b/tools/llvm-nm/llvm-nm.cpp @@ -215,15 +215,15 @@ static void sortAndPrintSymbolList() { char SymbolAddrStr[10] = ""; char SymbolSizeStr[10] = ""; - if (OutputFormat == sysv || I->Address == object::UnknownAddressOrSize) + if (OutputFormat == sysv || I->Address == UnknownAddressOrSize) strcpy(SymbolAddrStr, " "); if (OutputFormat == sysv) strcpy(SymbolSizeStr, " "); - if (I->Address != object::UnknownAddressOrSize) + if (I->Address != UnknownAddressOrSize) format("%08" PRIx64, I->Address) .print(SymbolAddrStr, sizeof(SymbolAddrStr)); - if (I->Size != object::UnknownAddressOrSize) + if (I->Size != UnknownAddressOrSize) format("%08" PRIx64, I->Size).print(SymbolSizeStr, sizeof(SymbolSizeStr)); if (OutputFormat == posix) { @@ -234,7 +234,7 @@ static void sortAndPrintSymbolList() { outs() << SymbolAddrStr << ' '; if (PrintSize) { outs() << SymbolSizeStr; - if (I->Size != object::UnknownAddressOrSize) + if (I->Size != UnknownAddressOrSize) outs() << ' '; } outs() << I->TypeChar << " " << I->Name << "\n"; @@ -287,8 +287,8 @@ static void dumpSymbolNameForGlobalValue(GlobalValue &GV) { return; NMSymbol S; - S.Address = object::UnknownAddressOrSize; - S.Size = object::UnknownAddressOrSize; + S.Address = UnknownAddressOrSize; + S.Size = UnknownAddressOrSize; S.TypeChar = TypeChar; S.Name = GV.getName(); SymbolList.push_back(S); @@ -567,8 +567,8 @@ static void dumpSymbolNamesFromObject(ObjectFile *Obj) { if (!DebugSyms && (SymFlags & SymbolRef::SF_FormatSpecific)) continue; NMSymbol S; - S.Size = object::UnknownAddressOrSize; - S.Address = object::UnknownAddressOrSize; + S.Size = UnknownAddressOrSize; + S.Address = UnknownAddressOrSize; if (PrintSize || SizeSort) { if (error(I->getSize(S.Size))) break; @@ -606,20 +606,19 @@ static void dumpSymbolNamesFromFile(std::string &Filename) { return; } - ErrorOr<Binary *> BinaryOrErr = object::createBinary(Buffer.take(), Magic); + ErrorOr<Binary *> BinaryOrErr = createBinary(Buffer.take(), Magic); if (error(BinaryOrErr.getError(), Filename)) return; OwningPtr<Binary> Bin(BinaryOrErr.get()); - if (object::Archive *A = dyn_cast<object::Archive>(Bin.get())) { + if (Archive *A = dyn_cast<Archive>(Bin.get())) { if (ArchiveMap) { - object::Archive::symbol_iterator I = A->symbol_begin(); - object::Archive::symbol_iterator E = A->symbol_end(); + Archive::symbol_iterator I = A->symbol_begin(); + Archive::symbol_iterator E = A->symbol_end(); if (I != E) { - outs() << "Archive map" - << "\n"; + outs() << "Archive map\n"; for (; I != E; ++I) { - object::Archive::child_iterator C; + Archive::child_iterator C; StringRef SymName; StringRef FileName; if (error(I->getMember(C))) @@ -634,8 +633,7 @@ static void dumpSymbolNamesFromFile(std::string &Filename) { } } - for (object::Archive::child_iterator I = A->child_begin(), - E = A->child_end(); + for (Archive::child_iterator I = A->child_begin(), E = A->child_end(); I != E; ++I) { OwningPtr<Binary> Child; if (I->getAsBinary(Child)) { @@ -652,17 +650,17 @@ static void dumpSymbolNamesFromFile(std::string &Filename) { } continue; } - if (object::ObjectFile *O = dyn_cast<ObjectFile>(Child.get())) { + if (ObjectFile *O = dyn_cast<ObjectFile>(Child.get())) { outs() << O->getFileName() << ":\n"; dumpSymbolNamesFromObject(O); } } return; } - if (object::MachOUniversalBinary *UB = + if (MachOUniversalBinary *UB = dyn_cast<object::MachOUniversalBinary>(Bin.get())) { - for (object::MachOUniversalBinary::object_iterator I = UB->begin_objects(), - E = UB->end_objects(); + for (MachOUniversalBinary::object_iterator I = UB->begin_objects(), + E = UB->end_objects(); I != E; ++I) { OwningPtr<ObjectFile> Obj; if (!I->getAsObjectFile(Obj)) { @@ -672,7 +670,7 @@ static void dumpSymbolNamesFromFile(std::string &Filename) { } return; } - if (object::ObjectFile *O = dyn_cast<ObjectFile>(Bin.get())) { + if (ObjectFile *O = dyn_cast<ObjectFile>(Bin.get())) { dumpSymbolNamesFromObject(O); return; } |