summaryrefslogtreecommitdiffstats
path: root/llvm/tools
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2015-11-01 00:10:37 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2015-11-01 00:10:37 +0000
commite0d30803134195bfce7f85ab38bb92ec91ed9380 (patch)
treeb6eb54ff956ca63597bb8332667310ae2aa3ba40 /llvm/tools
parent5cdf91519145b87ded4fa118bb24314f43f9d642 (diff)
downloadbcm5719-llvm-e0d30803134195bfce7f85ab38bb92ec91ed9380.tar.gz
bcm5719-llvm-e0d30803134195bfce7f85ab38bb92ec91ed9380.zip
Use Child instead of child_iterator in the archive writer.
We never need to pass end(). This will also remove some complication once we start adding error checking. llvm-svn: 251758
Diffstat (limited to 'llvm/tools')
-rw-r--r--llvm/tools/llvm-ar/llvm-ar.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/llvm/tools/llvm-ar/llvm-ar.cpp b/llvm/tools/llvm-ar/llvm-ar.cpp
index c8ff53b58b2..b63856b9f7f 100644
--- a/llvm/tools/llvm-ar/llvm-ar.cpp
+++ b/llvm/tools/llvm-ar/llvm-ar.cpp
@@ -446,11 +446,10 @@ void addMember(std::vector<NewArchiveIterator> &Members, StringRef FileName,
}
void addMember(std::vector<NewArchiveIterator> &Members,
- object::Archive::child_iterator I, StringRef Name,
- int Pos = -1) {
- if (Thin && !I->getParent()->isThin())
+ const object::Archive::Child &M, StringRef Name, int Pos = -1) {
+ if (Thin && !M.getParent()->isThin())
fail("Cannot convert a regular archive to a thin one");
- NewArchiveIterator NI(I, Name);
+ NewArchiveIterator NI(M, Name);
if (Pos == -1)
Members.push_back(NI);
else
OpenPOWER on IntegriCloud