Revert 141376 and 141377 due to breaking the build.

--- Reverse-merging r141377 into '.':
U    tools/llvm-objdump/MachODump.cpp
--- Reverse-merging r141376 into '.':
U    include/llvm/Object/COFF.h
U    include/llvm/Object/ObjectFile.h
U    include/llvm-c/Object.h
U    tools/llvm-objdump/llvm-objdump.cpp
U    lib/Object/MachOObjectFile.cpp
U    lib/Object/COFFObjectFile.cpp
U    lib/Object/Object.cpp
U    lib/Object/ELFObjectFile.cpp

llvm-svn: 141379

1 files changed, 2 insertions, 2 deletions

diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
index bb4a77b..78824e9 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp
@@ -155,7 +155,7 @@ void llvm::DisassembleInputLibObject(StringRef Filename) {
          << ":\tfile format " << Obj->getFileFormatName() << "\n\n";
 
   error_code ec;
-  for (section_iterator i = Obj->begin_sections(),
+  for (ObjectFile::section_iterator i = Obj->begin_sections(),
                                     e = Obj->end_sections();
                                     i != e; i.increment(ec)) {
     if (error(ec)) break;
@@ -165,7 +165,7 @@ void llvm::DisassembleInputLibObject(StringRef Filename) {
 
     // Make a list of all the symbols in this section.
     std::vector<std::pair<uint64_t, StringRef> > Symbols;
-    for (symbol_iterator si = Obj->begin_symbols(),
+    for (ObjectFile::symbol_iterator si = Obj->begin_symbols(),
                                      se = Obj->end_symbols();
                                      si != se; si.increment(ec)) {
       bool contains;