From 04ae3a433e2403fd0ffc30ffeb2978c0bb789f4f Mon Sep 17 00:00:00 2001 From: "bfulgham@webkit.org" Date: Wed, 15 Jul 2009 01:11:29 +0000 Subject: [PATCH] 2009-07-14 Zoltan Horvath Reviewed by Darin Adler. Change ParserArenaRefCounted's superclass to RefCountedCustomAllocated https://bugs.webkit.org/show_bug.cgi?id=27249 ParserArenaDeletable customizes operator new, to avoid double inheritance ParserArenaDeletable's superclass has been changed to RefCountedCustomAllocated. * parser/Nodes.h: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@45887 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- JavaScriptCore/ChangeLog | 12 ++++++++++++ JavaScriptCore/parser/Nodes.h | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog index dbbea15..ab36c2e 100644 --- a/JavaScriptCore/ChangeLog +++ b/JavaScriptCore/ChangeLog @@ -2,6 +2,18 @@ Reviewed by Darin Adler. + Change ParserArenaRefCounted's superclass to RefCountedCustomAllocated + https://bugs.webkit.org/show_bug.cgi?id=27249 + + ParserArenaDeletable customizes operator new, to avoid double inheritance + ParserArenaDeletable's superclass has been changed to RefCountedCustomAllocated. + + * parser/Nodes.h: + +2009-07-14 Zoltan Horvath + + Reviewed by Darin Adler. + Add RefCountedCustomAllocated to RefCounted.h https://bugs.webkit.org/show_bug.cgi?id=27232 diff --git a/JavaScriptCore/parser/Nodes.h b/JavaScriptCore/parser/Nodes.h index 34b4497..84e8b95 100644 --- a/JavaScriptCore/parser/Nodes.h +++ b/JavaScriptCore/parser/Nodes.h @@ -113,7 +113,7 @@ namespace JSC { void operator delete(void*); }; - class ParserArenaRefCounted : public RefCounted { + class ParserArenaRefCounted : public RefCountedCustomAllocated { protected: ParserArenaRefCounted(JSGlobalData*); -- 1.8.3.1