summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2015-11-03 01:32:40 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2015-11-03 01:32:40 +0000
commit52151b3edf1acd452134eb3f1e1166736db0f03f (patch)
treea305fc67a247022b9b195a4531222c7067092e95
parent7dd37e52b17371ba8d88065651e432d84cfb5f9c (diff)
downloadbcm5719-llvm-52151b3edf1acd452134eb3f1e1166736db0f03f.tar.gz
bcm5719-llvm-52151b3edf1acd452134eb3f1e1166736db0f03f.zip
Don't implicitly construct a Archive::child_iterator.
llvm-svn: 251878
-rw-r--r--llvm/tools/llvm-nm/llvm-nm.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/tools/llvm-nm/llvm-nm.cpp b/llvm/tools/llvm-nm/llvm-nm.cpp
index 5cf6b4fb2ce..94866291899 100644
--- a/llvm/tools/llvm-nm/llvm-nm.cpp
+++ b/llvm/tools/llvm-nm/llvm-nm.cpp
@@ -952,10 +952,10 @@ static void dumpSymbolNamesFromFile(std::string &Filename) {
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();
OpenPOWER on IntegriCloud