From cbfe183cd9068f747d27aba1ad707cc4d22ee060 Mon Sep 17 00:00:00 2001
From: "peterv%propagandism.org"
 <peterv%propagandism.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 29 Jul 2006 21:15:55 +0000
Subject: [PATCH] Try to fix VC 6 bustage.

git-svn-id: svn://10.0.0.236/trunk@206069 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/base/src/nsDocument.cpp | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp
index 32898d239ae..3da6566c1aa 100644
--- a/mozilla/content/base/src/nsDocument.cpp
+++ b/mozilla/content/base/src/nsDocument.cpp
@@ -3846,7 +3846,19 @@ nsDocument::SetDocumentURI(const nsAString& aDocumentURI)
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-struct AdoptFuncData {
+class AdoptFuncData {
+public:
+  AdoptFuncData(nsNodeInfoManager *aNewNodeInfoManager, JSContext *aCx,
+                JSObject *aOldScope, JSObject *aNewScope,
+                nsCOMArray<nsINode> &aNodesWithProperties)
+    : mNewNodeInfoManager(aNewNodeInfoManager),
+      mCx(aCx),
+      mOldScope(aOldScope),
+      mNewScope(aNewScope),
+      mNodesWithProperties(aNodesWithProperties)
+  {
+  };
+
   nsNodeInfoManager *mNewNodeInfoManager;
   JSContext *mCx;
   JSObject *mOldScope;
@@ -3885,8 +3897,8 @@ nsDocument::Adopt(nsINode *aNode, nsNodeInfoManager *aNewNodeInfoManager,
     nsGenericElement *element = NS_STATIC_CAST(nsGenericElement*, aNode);
     const nsDOMAttributeMap *map = element->GetAttributeMap();
     if (map) {
-      AdoptFuncData data = { aNewNodeInfoManager, aCx, aOldScope, aNewScope,
-                             aNodesWithProperties };
+      AdoptFuncData data(aNewNodeInfoManager, aCx, aOldScope, aNewScope,
+                         aNodesWithProperties);
  
       PRUint32 count = map->Enumerate(AdoptFunc, &data);
       NS_ENSURE_TRUE(count == map->Count(), NS_ERROR_FAILURE);