[llvm] r251878 - Don't implicitly construct a Archive::child_iterator.

[Rafael Espindola via llvm-commits]

Author: rafael
Date: Mon Nov  2 19:32:40 2015
New Revision: 251878

URL: http://llvm.org/viewvc/llvm-project?rev=251878&view=rev
Log:
Don't implicitly construct a Archive::child_iterator.

Modified:
    llvm/trunk/tools/llvm-nm/llvm-nm.cpp

Modified: llvm/trunk/tools/llvm-nm/llvm-nm.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-nm/llvm-nm.cpp?rev=251878&r1=251877&r2=251878&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-nm/llvm-nm.cpp (original)
+++ llvm/trunk/tools/llvm-nm/llvm-nm.cpp Mon Nov  2 19:32:40 2015
@@ -952,10 +952,10 @@ static void dumpSymbolNamesFromFile(std:
       if (I != E) {
         outs() << "Archive map\n";
         for (; I != E; ++I) {
-          ErrorOr<Archive::child_iterator> C = I->getMember();
+          ErrorOr<Archive::Child> C = I->getMember();
           if (error(C.getError()))
             return;
-          ErrorOr<StringRef> FileNameOrErr = C.get()->getName();
+          ErrorOr<StringRef> FileNameOrErr = C->getName();
           if (error(FileNameOrErr.getError()))
             return;
           StringRef SymName = I->getName();