[llvm] r241753 - Revert part of "Disallow Archive::child_iterator that don't point to an archive."

[Rafael Espindola]

Author: rafael
Date: Wed Jul  8 17:41:41 2015
New Revision: 241753

URL: http://llvm.org/viewvc/llvm-project?rev=241753&view=rev
Log:
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.

Modified:
    llvm/trunk/include/llvm/Object/Archive.h
    llvm/trunk/include/llvm/Object/ArchiveWriter.h

Modified: llvm/trunk/include/llvm/Object/Archive.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/Archive.h?rev=241753&r1=241752&r2=241753&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Object/Archive.h (original)
+++ llvm/trunk/include/llvm/Object/Archive.h Wed Jul  8 17:41:41 2015
@@ -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; }

Modified: llvm/trunk/include/llvm/Object/ArchiveWriter.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/ArchiveWriter.h?rev=241753&r1=241752&r2=241753&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Object/ArchiveWriter.h (original)
+++ llvm/trunk/include/llvm/Object/ArchiveWriter.h Wed Jul  8 17:41:41 2015
@@ -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);