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

diff --git a/include/llvm/Object/Archive.h b/include/llvm/Object/Archive.h
index 40f7584203ec48cd88814069d9f452b39f7d3dd8..8da6919a46555cf515e8ab379c87f2bf47fcf9a1 100644 (file)
--- 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 4937fffe1f822199cf30a93822cb7b6d2737a9c2..a467b25f0bce0b5d58b9e7cd83ce49841d11a2d0 100644 (file)
--- 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);