зеркало из https://github.com/mozilla/pjs.git
Fix gcc-2.7.2.3 bustage.
This commit is contained in:
waterson%netscape.com
Родитель
260fe09744
Коммит
f01d28d713
|
|
@ -132,7 +132,7 @@ nsContentTestNode::FilterInstantiations(InstantiationSet& aInstantiations, void*
|
|||
|
||||
if (consistent) {
|
||||
Element* element =
|
||||
Element::Create(mConflictSet.GetPool(),
|
||||
nsContentTestNode::Element::Create(mConflictSet.GetPool(),
|
||||
VALUE_TO_ICONTENT(contentValue));
|
||||
|
||||
if (! element)
|
||||
|
|
@ -168,7 +168,7 @@ nsContentTestNode::FilterInstantiations(InstantiationSet& aInstantiations, void*
|
|||
newinst.AddAssignment(mIdVariable, Value(resource.get()));
|
||||
|
||||
Element* element =
|
||||
Element::Create(mConflictSet.GetPool(), content);
|
||||
nsContentTestNode::Element::Create(mConflictSet.GetPool(), content);
|
||||
|
||||
if (! element)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
|
@ -213,7 +213,7 @@ nsContentTestNode::FilterInstantiations(InstantiationSet& aInstantiations, void*
|
|||
newinst.AddAssignment(mContentVariable, Value(content.get()));
|
||||
|
||||
Element* element =
|
||||
Element::Create(mConflictSet.GetPool(), content);
|
||||
nsContentTestNode::Element::Create(mConflictSet.GetPool(), content);
|
||||
|
||||
if (! element)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ nsOutlinerRowTestNode::FilterInstantiations(InstantiationSet& aInstantiations, v
|
|||
|
||||
PR_LOG(gXULTemplateLog, PR_LOG_DEBUG, (" => passed"));
|
||||
Element* element =
|
||||
Element::Create(mConflictSet.GetPool(), container);
|
||||
nsOutlinerRowTestNode::Element::Create(mConflictSet.GetPool(), container);
|
||||
|
||||
if (! element)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
|
|
|||
|
|
@ -173,9 +173,9 @@ nsRDFConInstanceTestNode::FilterInstantiations(InstantiationSet& aInstantiations
|
|||
|
||||
if (empty == mEmpty) {
|
||||
Element* element =
|
||||
Element::Create(mConflictSet.GetPool(),
|
||||
VALUE_TO_IRDFRESOURCE(value),
|
||||
mContainer, mEmpty);
|
||||
nsRDFConInstanceTestNode::Element::Create(mConflictSet.GetPool(),
|
||||
VALUE_TO_IRDFRESOURCE(value),
|
||||
mContainer, mEmpty);
|
||||
|
||||
if (! element)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
|
@ -235,9 +235,9 @@ nsRDFConInstanceTestNode::FilterInstantiations(InstantiationSet& aInstantiations
|
|||
|
||||
if (container == mContainer) {
|
||||
Element* element =
|
||||
Element::Create(mConflictSet.GetPool(),
|
||||
VALUE_TO_IRDFRESOURCE(value),
|
||||
mContainer, mEmpty);
|
||||
nsRDFConInstanceTestNode::Element::Create(mConflictSet.GetPool(),
|
||||
VALUE_TO_IRDFRESOURCE(value),
|
||||
mContainer, mEmpty);
|
||||
|
||||
|
||||
if (! element)
|
||||
|
|
|
|||
|
|
@ -184,9 +184,9 @@ nsRDFConMemberTestNode::FilterInstantiations(InstantiationSet& aInstantiations,
|
|||
if (isconsistent) {
|
||||
// Add a memory element to our set-of-support.
|
||||
Element* element =
|
||||
Element::Create(mConflictSet.GetPool(),
|
||||
VALUE_TO_IRDFRESOURCE(containerValue),
|
||||
VALUE_TO_IRDFNODE(memberValue));
|
||||
nsRDFConMemberTestNode::Element::Create(mConflictSet.GetPool(),
|
||||
VALUE_TO_IRDFRESOURCE(containerValue),
|
||||
VALUE_TO_IRDFNODE(memberValue));
|
||||
|
||||
if (! element)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
|
@ -240,9 +240,9 @@ nsRDFConMemberTestNode::FilterInstantiations(InstantiationSet& aInstantiations,
|
|||
newinst.AddAssignment(mMemberVariable, Value(node.get()));
|
||||
|
||||
Element* element =
|
||||
Element::Create(mConflictSet.GetPool(),
|
||||
VALUE_TO_IRDFRESOURCE(containerValue),
|
||||
node);
|
||||
nsRDFConMemberTestNode::Element::Create(mConflictSet.GetPool(),
|
||||
VALUE_TO_IRDFRESOURCE(containerValue),
|
||||
node);
|
||||
|
||||
if (! element)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
|
@ -333,9 +333,9 @@ nsRDFConMemberTestNode::FilterInstantiations(InstantiationSet& aInstantiations,
|
|||
newinst.AddAssignment(mContainerVariable, Value(source.get()));
|
||||
|
||||
Element* element =
|
||||
Element::Create(mConflictSet.GetPool(),
|
||||
source,
|
||||
VALUE_TO_IRDFNODE(memberValue));
|
||||
nsRDFConMemberTestNode::Element::Create(mConflictSet.GetPool(),
|
||||
source,
|
||||
VALUE_TO_IRDFNODE(memberValue));
|
||||
|
||||
if (! element)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
|
@ -429,14 +429,16 @@ nsRDFConMemberTestNode::FilterInstantiations(InstantiationSet& aInstantiations,
|
|||
|
||||
Element* element;
|
||||
if (hasContainerBinding) {
|
||||
element = Element::Create(mConflictSet.GetPool(),
|
||||
VALUE_TO_IRDFRESOURCE(containerValue),
|
||||
VALUE_TO_IRDFNODE(value));
|
||||
element =
|
||||
nsRDFConMemberTestNode::Element::Create(mConflictSet.GetPool(),
|
||||
VALUE_TO_IRDFRESOURCE(containerValue),
|
||||
VALUE_TO_IRDFNODE(value));
|
||||
}
|
||||
else {
|
||||
element = Element::Create(mConflictSet.GetPool(),
|
||||
VALUE_TO_IRDFRESOURCE(value),
|
||||
VALUE_TO_IRDFNODE(memberValue));
|
||||
element =
|
||||
nsRDFConMemberTestNode::Element::Create(mConflictSet.GetPool(),
|
||||
VALUE_TO_IRDFRESOURCE(value),
|
||||
VALUE_TO_IRDFNODE(memberValue));
|
||||
}
|
||||
|
||||
if (! element)
|
||||
|
|
|
|||
|
|
@ -188,10 +188,10 @@ nsRDFPropertyTestNode::FilterInstantiations(InstantiationSet& aInstantiations, v
|
|||
if (hasAssertion) {
|
||||
// it's consistent.
|
||||
Element* element =
|
||||
Element::Create(mConflictSet.GetPool(),
|
||||
VALUE_TO_IRDFRESOURCE(sourceValue),
|
||||
mProperty,
|
||||
VALUE_TO_IRDFNODE(targetValue));
|
||||
nsRDFPropertyTestNode::Element::Create(mConflictSet.GetPool(),
|
||||
VALUE_TO_IRDFRESOURCE(sourceValue),
|
||||
mProperty,
|
||||
VALUE_TO_IRDFNODE(targetValue));
|
||||
|
||||
if (! element)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
|
@ -288,10 +288,10 @@ nsRDFPropertyTestNode::FilterInstantiations(InstantiationSet& aInstantiations, v
|
|||
newinst.AddAssignment(variable, value);
|
||||
|
||||
Element* element =
|
||||
Element::Create(mConflictSet.GetPool(),
|
||||
VALUE_TO_IRDFRESOURCE(sourceValue),
|
||||
mProperty,
|
||||
VALUE_TO_IRDFNODE(targetValue));
|
||||
nsRDFPropertyTestNode::Element::Create(mConflictSet.GetPool(),
|
||||
VALUE_TO_IRDFRESOURCE(sourceValue),
|
||||
mProperty,
|
||||
VALUE_TO_IRDFNODE(targetValue));
|
||||
|
||||
if (! element)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
|
|
|||
|
|
@ -277,7 +277,8 @@ nsTemplateMatchRefSet::ConstIterator
|
|||
nsTemplateMatchRefSet::First() const
|
||||
{
|
||||
if (mInlineMatches.mCount <= kMaxInlineMatches)
|
||||
return ConstIterator(this, NS_CONST_CAST(nsTemplateMatch**, mInlineMatches.mEntries));
|
||||
// XXX C-style cast to avoid gcc-2.7.2.3. bustage
|
||||
return ConstIterator(this, (nsTemplateMatch**) mInlineMatches.mEntries);
|
||||
|
||||
Entry* entry = NS_REINTERPRET_CAST(Entry*, mTable.entryStore);
|
||||
Entry* limit = entry + PR_BIT(mTable.sizeLog2);
|
||||
|
|
@ -294,7 +295,8 @@ nsTemplateMatchRefSet::Last() const
|
|||
{
|
||||
PRUint32 count = mInlineMatches.mCount;
|
||||
if (count <= kMaxInlineMatches) {
|
||||
nsTemplateMatch** first = NS_CONST_CAST(nsTemplateMatch**, mInlineMatches.mEntries);
|
||||
// XXX C-style cast to avoid gcc-2.7.2.3 bustage
|
||||
nsTemplateMatch** first = (nsTemplateMatch**) mInlineMatches.mEntries;
|
||||
nsTemplateMatch** limit = first + count;
|
||||
return ConstIterator(this, limit);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ nsOutlinerRowTestNode::FilterInstantiations(InstantiationSet& aInstantiations, v
|
|||
|
||||
PR_LOG(gXULTemplateLog, PR_LOG_DEBUG, (" => passed"));
|
||||
Element* element =
|
||||
Element::Create(mConflictSet.GetPool(), container);
|
||||
nsOutlinerRowTestNode::Element::Create(mConflictSet.GetPool(), container);
|
||||
|
||||
if (! element)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче