mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-23 02:29:18 +00:00
Revert part of "Disallow Archive::child_iterator that don't point to an archive."
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:
parent
f769239c19
commit
c155a415e8
@ -109,6 +109,7 @@ public:
|
|||||||
Child child;
|
Child child;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
child_iterator() : child(Child(nullptr, nullptr)) {}
|
||||||
child_iterator(const Child &c) : child(c) {}
|
child_iterator(const Child &c) : child(c) {}
|
||||||
const Child *operator->() const { return &child; }
|
const Child *operator->() const { return &child; }
|
||||||
const Child &operator*() const { return child; }
|
const Child &operator*() const { return child; }
|
||||||
|
@ -24,10 +24,9 @@ class NewArchiveIterator {
|
|||||||
bool IsNewMember;
|
bool IsNewMember;
|
||||||
StringRef Name;
|
StringRef Name;
|
||||||
|
|
||||||
union {
|
|
||||||
object::Archive::child_iterator OldI;
|
object::Archive::child_iterator OldI;
|
||||||
|
|
||||||
StringRef NewFilename;
|
StringRef NewFilename;
|
||||||
};
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
NewArchiveIterator(object::Archive::child_iterator I, StringRef Name);
|
NewArchiveIterator(object::Archive::child_iterator I, StringRef Name);
|
||||||
|
Loading…
Reference in New Issue
Block a user