diff --git a/mozilla/htmlparser/src/nsParserNode.h b/mozilla/htmlparser/src/nsParserNode.h
index 9b7f4f1cc0c..70a036b0523 100644
--- a/mozilla/htmlparser/src/nsParserNode.h
+++ b/mozilla/htmlparser/src/nsParserNode.h
@@ -85,7 +85,7 @@ class nsCParserNode : public nsIParserNode {
}
#ifndef HEAP_ALLOCATED_NODES
- private:
+ protected:
/**
* Hide operator new; clients should use Create() instead.
@@ -288,14 +288,14 @@ public:
}
nsCParserStartNode()
- : mAttributes(0), nsCParserNode() { }
+ : nsCParserNode(), mAttributes(0) { }
nsCParserStartNode(CToken* aToken,
nsTokenAllocator* aTokenAllocator,
nsNodeAllocator* aNodeAllocator = 0)
- : mAttributes(0), nsCParserNode(aToken, aTokenAllocator, aNodeAllocator) { }
+ : nsCParserNode(aToken, aTokenAllocator, aNodeAllocator), mAttributes(0) { }
- ~nsCParserStartNode()
+ virtual ~nsCParserStartNode()
{
NS_ASSERTION(0 != mTokenAllocator, "Error: no token allocator");
CToken* theAttrToken = 0;
diff --git a/mozilla/parser/htmlparser/src/nsParserNode.h b/mozilla/parser/htmlparser/src/nsParserNode.h
index 9b7f4f1cc0c..70a036b0523 100644
--- a/mozilla/parser/htmlparser/src/nsParserNode.h
+++ b/mozilla/parser/htmlparser/src/nsParserNode.h
@@ -85,7 +85,7 @@ class nsCParserNode : public nsIParserNode {
}
#ifndef HEAP_ALLOCATED_NODES
- private:
+ protected:
/**
* Hide operator new; clients should use Create() instead.
@@ -288,14 +288,14 @@ public:
}
nsCParserStartNode()
- : mAttributes(0), nsCParserNode() { }
+ : nsCParserNode(), mAttributes(0) { }
nsCParserStartNode(CToken* aToken,
nsTokenAllocator* aTokenAllocator,
nsNodeAllocator* aNodeAllocator = 0)
- : mAttributes(0), nsCParserNode(aToken, aTokenAllocator, aNodeAllocator) { }
+ : nsCParserNode(aToken, aTokenAllocator, aNodeAllocator), mAttributes(0) { }
- ~nsCParserStartNode()
+ virtual ~nsCParserStartNode()
{
NS_ASSERTION(0 != mTokenAllocator, "Error: no token allocator");
CToken* theAttrToken = 0;