diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-10-21 23:04:55 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-10-21 23:04:55 +0000 |
commit | ef1c9ad8644d495c32a39b69763898e262b216bd (patch) | |
tree | 43e36b4fa2ff8cdcd27d519bfc7542071cbbf6c6 /llvm/tools/llvm-ar/llvm-ar.cpp | |
parent | d20f1e6dd3153e2cda30addf79fb9f781a3449aa (diff) | |
download | bcm5719-llvm-ef1c9ad8644d495c32a39b69763898e262b216bd.tar.gz bcm5719-llvm-ef1c9ad8644d495c32a39b69763898e262b216bd.zip |
Use a range loop. NFC.
llvm-svn: 220344
Diffstat (limited to 'llvm/tools/llvm-ar/llvm-ar.cpp')
-rw-r--r-- | llvm/tools/llvm-ar/llvm-ar.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/llvm/tools/llvm-ar/llvm-ar.cpp b/llvm/tools/llvm-ar/llvm-ar.cpp index a6517e8510d..aff8a04cce5 100644 --- a/llvm/tools/llvm-ar/llvm-ar.cpp +++ b/llvm/tools/llvm-ar/llvm-ar.cpp @@ -554,11 +554,9 @@ computeNewArchiveMembers(ArchiveOperation Operation, int InsertPos = -1; StringRef PosName = sys::path::filename(RelPos); if (OldArchive) { - for (object::Archive::child_iterator I = OldArchive->child_begin(), - E = OldArchive->child_end(); - I != E; ++I) { + for (auto &Child : OldArchive->children()) { int Pos = Ret.size(); - ErrorOr<StringRef> NameOrErr = I->getName(); + ErrorOr<StringRef> NameOrErr = Child.getName(); failIfError(NameOrErr.getError()); StringRef Name = NameOrErr.get(); if (Name == PosName) { @@ -570,10 +568,11 @@ computeNewArchiveMembers(ArchiveOperation Operation, } std::vector<StringRef>::iterator MemberI = Members.end(); - InsertAction Action = computeInsertAction(Operation, I, Name, MemberI); + InsertAction Action = + computeInsertAction(Operation, Child, Name, MemberI); switch (Action) { case IA_AddOldMember: - addMember(Ret, I, Name); + addMember(Ret, Child, Name); break; case IA_AddNewMeber: addMember(Ret, *MemberI, Name); @@ -581,7 +580,7 @@ computeNewArchiveMembers(ArchiveOperation Operation, case IA_Delete: break; case IA_MoveOldMember: - addMember(Moved, I, Name); + addMember(Moved, Child, Name); break; case IA_MoveNewMember: addMember(Moved, *MemberI, Name); |