diff --git a/include/llvm/Object/Archive.h b/include/llvm/Object/Archive.h index 40f7584203e..8da6919a465 100644 --- a/include/llvm/Object/Archive.h +++ b/include/llvm/Object/Archive.h @@ -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; } diff --git a/include/llvm/Object/ArchiveWriter.h b/include/llvm/Object/ArchiveWriter.h index 4937fffe1f8..a467b25f0bc 100644 --- a/include/llvm/Object/ArchiveWriter.h +++ b/include/llvm/Object/ArchiveWriter.h @@ -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);