6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-07 12:28:24 +00:00
Code Issues Projects Releases Wiki Activity

Use a range loop. NFC.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@220344 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2014-10-21 23:04:55 +00:00
parent 015776f38c
commit e0b4b36be6
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/llvm-ar/llvm-ar.cpp
View File

@@ -554,11 +554,9 @@ computeNewArchiveMembers(ArchiveOperation Operation,
int InsertPos = -1; int InsertPos = -1;
StringRef PosName = sys::path::filename(RelPos); StringRef PosName = sys::path::filename(RelPos);
if (OldArchive) { if (OldArchive) {
for (object::Archive::child_iterator I = OldArchive->child_begin(), for (auto &Child : OldArchive->children()) {
E = OldArchive->child_end();
I != E; ++I) {
int Pos = Ret.size(); int Pos = Ret.size();
ErrorOr<StringRef> NameOrErr = I->getName(); ErrorOr<StringRef> NameOrErr = Child.getName();
failIfError(NameOrErr.getError()); failIfError(NameOrErr.getError());
StringRef Name = NameOrErr.get(); StringRef Name = NameOrErr.get();
if (Name == PosName) { if (Name == PosName) {
@@ -570,10 +568,11 @@ computeNewArchiveMembers(ArchiveOperation Operation,
} }
std::vector<StringRef>::iterator MemberI = Members.end(); std::vector<StringRef>::iterator MemberI = Members.end();
InsertAction Action = computeInsertAction(Operation, I, Name, MemberI); InsertAction Action =
computeInsertAction(Operation, Child, Name, MemberI);
switch (Action) { switch (Action) {
case IA_AddOldMember: case IA_AddOldMember:
addMember(Ret, I, Name); addMember(Ret, Child, Name);
break; break;
case IA_AddNewMeber: case IA_AddNewMeber:
addMember(Ret, *MemberI, Name); addMember(Ret, *MemberI, Name);
@@ -581,7 +580,7 @@ computeNewArchiveMembers(ArchiveOperation Operation,
case IA_Delete: case IA_Delete:
break; break;
case IA_MoveOldMember: case IA_MoveOldMember:
addMember(Moved, I, Name); addMember(Moved, Child, Name);
break; break;
case IA_MoveNewMember: case IA_MoveNewMember:
addMember(Moved, *MemberI, Name); addMember(Moved, *MemberI, Name);