6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-04-28 23:38:59 +00:00
Code Issues Projects Releases Wiki Activity

Revert part of "Disallow Archive::child_iterator that don't point to an archive."

Browse Source 
This reverts parts of commit r241747. MSVC doesn't like it.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@241753 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2015-07-08 22:41:41 +00:00
parent f769239c19
commit c155a415e8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/llvm/Object/Archive.h
View File

@ -109,6 +109,7 @@ public:
Child child;
public:
child_iterator() : child(Child(nullptr, nullptr)) {}
child_iterator(const Child &c) : child(c) {}
const Child *operator->() const { return &child; }
const Child &operator*() const { return child; }

3
include/llvm/Object/ArchiveWriter.h
View File

@ -24,10 +24,9 @@ class NewArchiveIterator {
bool IsNewMember;
StringRef Name;
union {
object::Archive::child_iterator OldI;
StringRef NewFilename;
};
public:
NewArchiveIterator(object::Archive::child_iterator I, StringRef Name);