From c4f7b5571434cd9a8822b769ecacac4cfa6ec8dd Mon Sep 17 00:00:00 2001
From: "bryner%brianryner.com" <bryner%brianryner.com>
Date: Wed, 3 Aug 2005 22:48:42 +0000
Subject: [PATCH] Fixing VC6 bustage - initialize with a ctor

---
 docshell/base/nsDocShell.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 0d17dc3db97d..a40b0950276a 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -7535,6 +7535,12 @@ nsDocShell::WalkHistoryEntries(nsISHEntry *aRootEntry,
 // callback data for WalkHistoryEntries
 struct CloneAndReplaceData
 {
+    CloneAndReplaceData(PRUint32 aCloneID, nsISHEntry *aReplaceEntry,
+                        nsISHEntry *aDestTreeParent)
+        : cloneID(aCloneID),
+          replaceEntry(aReplaceEntry),
+          destTreeParent(aDestTreeParent) { }
+
     PRUint32              cloneID;
     nsISHEntry           *replaceEntry;
     nsISHEntry           *destTreeParent;
@@ -7569,7 +7575,7 @@ nsDocShell::CloneAndReplaceChild(nsISHEntry *aEntry, nsDocShell *aShell,
         dest->SetIsSubFrame(PR_TRUE);
 
         // Walk the children
-        CloneAndReplaceData childData = { cloneID, replaceEntry, dest, nsnull };
+        CloneAndReplaceData childData(cloneID, replaceEntry, dest);
         result = WalkHistoryEntries(aEntry, aShell,
                                     CloneAndReplaceChild, &childData);
         if (NS_FAILED(result))
@@ -7598,7 +7604,7 @@ nsDocShell::CloneAndReplace(nsISHEntry *aSrcEntry,
     NS_ENSURE_ARG_POINTER(aResultEntry);
     NS_ENSURE_TRUE(aReplaceEntry, NS_ERROR_FAILURE);
 
-    CloneAndReplaceData data = { aCloneID, aReplaceEntry, nsnull, nsnull };
+    CloneAndReplaceData data(aCloneID, aReplaceEntry, nsnull);
     nsresult rv = CloneAndReplaceChild(aSrcEntry, aSrcShell, 0, &data);
 
     data.resultEntry.swap(*aResultEntry);