Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing VC6 bustage - initialize with a ctor

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@177083 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bryner%brianryner.com 2005-08-03 22:48:42 +00:00
parent dc7a8d1985
commit f2a6a0a997
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/docshell/base/nsDocShell.cpp
View File

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