6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-06 23:32:27 +00:00
Code Issues Projects Releases Wiki Activity

Fix c++03 build.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@200042 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2014-01-24 21:52:44 +00:00
parent 584fe2db6a
commit dbba2eb82f
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -692,7 +692,7 @@ static void writeStringTable(raw_fd_ostream &Out,
static void writeSymbolTable( static void writeSymbolTable(
raw_fd_ostream &Out, ArrayRef<NewArchiveIterator> Members, raw_fd_ostream &Out, ArrayRef<NewArchiveIterator> Members,
ArrayRef<OwningPtr<MemoryBuffer> > Buffers, ArrayRef<MemoryBuffer *> Buffers,
std::vector<std::pair<unsigned, unsigned> > &MemberOffsetRefs) { std::vector<std::pair<unsigned, unsigned> > &MemberOffsetRefs) {
unsigned StartOffset = 0; unsigned StartOffset = 0;
unsigned MemberNum = 0; unsigned MemberNum = 0;
@ -701,9 +701,9 @@ static void writeSymbolTable(
for (ArrayRef<NewArchiveIterator>::iterator I = Members.begin(), for (ArrayRef<NewArchiveIterator>::iterator I = Members.begin(),
E = Members.end(); E = Members.end();
I != E; ++I, ++MemberNum) { I != E; ++I, ++MemberNum) {
const OwningPtr<MemoryBuffer> &MemberBuffer = Buffers[MemberNum]; MemoryBuffer *MemberBuffer = Buffers[MemberNum];
ErrorOr<object::ObjectFile *> ObjOrErr = ErrorOr<object::ObjectFile *> ObjOrErr =
object::ObjectFile::createObjectFile(MemberBuffer.get(), false); object::ObjectFile::createObjectFile(MemberBuffer, false);
if (!ObjOrErr) if (!ObjOrErr)
continue; // FIXME: check only for "not an object file" errors. continue; // FIXME: check only for "not an object file" errors.
object::ObjectFile *Obj = ObjOrErr.get(); object::ObjectFile *Obj = ObjOrErr.get();
@ -778,11 +778,11 @@ static void performWriteOperation(ArchiveOperation Operation,
std::vector<std::pair<unsigned, unsigned> > MemberOffsetRefs; std::vector<std::pair<unsigned, unsigned> > MemberOffsetRefs;
std::vector<OwningPtr<MemoryBuffer> > MemberBuffers; std::vector<MemoryBuffer *> MemberBuffers;
MemberBuffers.resize(NewMembers.size()); MemberBuffers.resize(NewMembers.size());
for (unsigned I = 0, N = NewMembers.size(); I < N; ++I) { for (unsigned I = 0, N = NewMembers.size(); I < N; ++I) {
OwningPtr<MemoryBuffer> &MemberBuffer = MemberBuffers[I]; OwningPtr<MemoryBuffer> MemberBuffer;
NewArchiveIterator &Member = NewMembers[I]; NewArchiveIterator &Member = NewMembers[I];
if (Member.isNewMember()) { if (Member.isNewMember()) {
@ -797,6 +797,7 @@ static void performWriteOperation(ArchiveOperation Operation,
object::Archive::child_iterator OldMember = Member.getOld(); object::Archive::child_iterator OldMember = Member.getOld();
failIfError(OldMember->getMemoryBuffer(MemberBuffer)); failIfError(OldMember->getMemoryBuffer(MemberBuffer));
} }
MemberBuffers[I] = MemberBuffer.take();
} }
if (Symtab) { if (Symtab) {
@ -824,7 +825,7 @@ static void performWriteOperation(ArchiveOperation Operation,
} }
Out.seek(Pos); Out.seek(Pos);
const OwningPtr<MemoryBuffer> &File = MemberBuffers[MemberNum]; const MemoryBuffer *File = MemberBuffers[MemberNum];
if (I->isNewMember()) { if (I->isNewMember()) {
const char *FileName = I->getNew(); const char *FileName = I->getNew();
const sys::fs::file_status &Status = I->getStatus(); const sys::fs::file_status &Status = I->getStatus();
@ -859,6 +860,11 @@ static void performWriteOperation(ArchiveOperation Operation,
if (Out.tell() % 2) if (Out.tell() % 2)
Out << '\n'; Out << '\n';
} }
for (unsigned I = 0, N = MemberBuffers.size(); I < N; ++I) {
delete MemberBuffers[I];
}
Output.keep(); Output.keep();
Out.close(); Out.close();
sys::fs::rename(TemporaryOutput, ArchiveName); sys::fs::rename(TemporaryOutput, ArchiveName);