From 51f2223c79d78609d8b74e9e9ec17af9f7c0e58e Mon Sep 17 00:00:00 2001 From: "darin%netscape.com" Date: Tue, 19 Nov 2002 19:42:46 +0000 Subject: [PATCH] fixing linux bustage: make |nsCParserNode::operator delete| protected instead of private. also fixes some warnings. --- htmlparser/src/nsParserNode.h | 8 ++++---- parser/htmlparser/src/nsParserNode.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/htmlparser/src/nsParserNode.h b/htmlparser/src/nsParserNode.h index 9b7f4f1cc0cb..70a036b05239 100644 --- a/htmlparser/src/nsParserNode.h +++ b/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/parser/htmlparser/src/nsParserNode.h b/parser/htmlparser/src/nsParserNode.h index 9b7f4f1cc0cb..70a036b05239 100644 --- a/parser/htmlparser/src/nsParserNode.h +++ b/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;