[llvm] r220344 - Use a range loop. NFC.
Rafael Espindola
rafael.espindola at gmail.com
Tue Oct 21 16:04:55 PDT 2014
Author: rafael
Date: Tue Oct 21 18:04:55 2014
New Revision: 220344
URL: http://llvm.org/viewvc/llvm-project?rev=220344&view=rev
Log:
Use a range loop. NFC.
Modified:
llvm/trunk/tools/llvm-ar/llvm-ar.cpp
Modified: llvm/trunk/tools/llvm-ar/llvm-ar.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-ar/llvm-ar.cpp?rev=220344&r1=220343&r2=220344&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-ar/llvm-ar.cpp (original)
+++ llvm/trunk/tools/llvm-ar/llvm-ar.cpp Tue Oct 21 18:04:55 2014
@@ -554,11 +554,9 @@ computeNewArchiveMembers(ArchiveOperatio
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(ArchiveOperatio
}
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(ArchiveOperatio
case IA_Delete:
break;
case IA_MoveOldMember:
- addMember(Moved, I, Name);
+ addMember(Moved, Child, Name);
break;
case IA_MoveNewMember:
addMember(Moved, *MemberI, Name);
More information about the llvm-commits
mailing list