From d20f3f5ea5c4cd044aa5db2f6526d3df035470f5 Mon Sep 17 00:00:00 2001 From: "shaver%mozilla.org" Date: Mon, 4 Mar 2002 03:47:08 +0000 Subject: [PATCH] Missed a few references to the unioned members (more btek fixage). git-svn-id: svn://10.0.0.236/trunk@115700 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/dom/src/base/nsScriptNameSpaceManager.cpp | 6 +++--- mozilla/dom/src/build/nsScriptNameSpaceManager.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mozilla/dom/src/base/nsScriptNameSpaceManager.cpp b/mozilla/dom/src/base/nsScriptNameSpaceManager.cpp index b6eac322009..92e0b1f7e86 100644 --- a/mozilla/dom/src/base/nsScriptNameSpaceManager.cpp +++ b/mozilla/dom/src/base/nsScriptNameSpaceManager.cpp @@ -105,7 +105,7 @@ GlobalNameHashClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry) // If we constructed an internal helper, we'll let the helper delete // the nsDOMClassInfoData structure, if not we do it here. - if (!ci || e->mGlobalName.mData->mExternalConstructorFptr) { + if (!ci || e->mGlobalName.mData->u.mExternalConstructorFptr) { delete e->mGlobalName.mData; } @@ -623,10 +623,10 @@ nsScriptNameSpaceManager::RegisterDOMCIData(const char *aName, s->mType = nsGlobalNameStruct::eTypeExternalClassInfo; s->mData->mName = aName; if (aConstructorFptr) - s->mData->mExternalConstructorFptr = aConstructorFptr; + s->mData->u.mExternalConstructorFptr = aConstructorFptr; else // null constructor will cause us to use nsDOMGenericSH::doCreate - s->mData->mExternalConstructorFptr = nsnull; + s->mData->u.mExternalConstructorFptr = nsnull; s->mData->mCachedClassInfo = nsnull; s->mData->mProtoChainInterface = aProtoChainInterface; s->mData->mInterfaces = aInterfaces; diff --git a/mozilla/dom/src/build/nsScriptNameSpaceManager.cpp b/mozilla/dom/src/build/nsScriptNameSpaceManager.cpp index b6eac322009..92e0b1f7e86 100644 --- a/mozilla/dom/src/build/nsScriptNameSpaceManager.cpp +++ b/mozilla/dom/src/build/nsScriptNameSpaceManager.cpp @@ -105,7 +105,7 @@ GlobalNameHashClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry) // If we constructed an internal helper, we'll let the helper delete // the nsDOMClassInfoData structure, if not we do it here. - if (!ci || e->mGlobalName.mData->mExternalConstructorFptr) { + if (!ci || e->mGlobalName.mData->u.mExternalConstructorFptr) { delete e->mGlobalName.mData; } @@ -623,10 +623,10 @@ nsScriptNameSpaceManager::RegisterDOMCIData(const char *aName, s->mType = nsGlobalNameStruct::eTypeExternalClassInfo; s->mData->mName = aName; if (aConstructorFptr) - s->mData->mExternalConstructorFptr = aConstructorFptr; + s->mData->u.mExternalConstructorFptr = aConstructorFptr; else // null constructor will cause us to use nsDOMGenericSH::doCreate - s->mData->mExternalConstructorFptr = nsnull; + s->mData->u.mExternalConstructorFptr = nsnull; s->mData->mCachedClassInfo = nsnull; s->mData->mProtoChainInterface = aProtoChainInterface; s->mData->mInterfaces = aInterfaces;