From c155a415e849b48bd6551bc5996218a91cdba4b3 Mon Sep 17 00:00:00 2001
From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Wed, 8 Jul 2015 22:41:41 +0000
Subject: [PATCH] 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
---
 include/llvm/Object/Archive.h       | 1 +
 include/llvm/Object/ArchiveWriter.h | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

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);