From 60d4560d174aa45687d60b0c135d3e6b7d082a34 Mon Sep 17 00:00:00 2001 From: abv Date: Thu, 12 Apr 2012 10:25:59 +0400 Subject: [PATCH] 0023002: empty delete operator in TDF_LabelNode Destruction of TDF_LabelNode class corrected so as to use consistently defined new/delete operators --- src/NCollection/NCollection_DefineAlloc.hxx | 3 +- src/TDF/TDF_Data.cxx | 13 +++---- src/TDF/TDF_Label.cxx | 14 ++------ src/TDF/TDF_LabelNode.cxx | 20 +++++------ src/TDF/TDF_LabelNode.hxx | 38 ++++++--------------- 5 files changed, 27 insertions(+), 61 deletions(-) diff --git a/src/NCollection/NCollection_DefineAlloc.hxx b/src/NCollection/NCollection_DefineAlloc.hxx index 3376bceda9..fd23549248 100644 --- a/src/NCollection/NCollection_DefineAlloc.hxx +++ b/src/NCollection/NCollection_DefineAlloc.hxx @@ -18,10 +18,11 @@ // purpose or non-infringement. Please see the License for the specific terms // and conditions governing the rights and limitations under the License. - #ifndef _NCollection_DefineAlloc_HeaderFile # define _NCollection_DefineAlloc_HeaderFile +#include + // Macro to overload placement new and delete operators for NCollection allocators. // For Borland C and old SUN compilers do not define placement delete // as it is not supported. diff --git a/src/TDF/TDF_Data.cxx b/src/TDF/TDF_Data.cxx index 252a0ab934..7d8d8df829 100755 --- a/src/TDF/TDF_Data.cxx +++ b/src/TDF/TDF_Data.cxx @@ -17,14 +17,6 @@ // purpose or non-infringement. Please see the License for the specific terms // and conditions governing the rights and limitations under the License. -// ------------- - -// Version: 0.0 -//Version Date Purpose -// 0.0 Feb 6 1997 Creation - - - #include #include @@ -48,6 +40,8 @@ #include #include +#include + #undef DEB_DELTA_CREATION #undef TDF_DATA_COMMIT_OPTIMIZED @@ -116,7 +110,8 @@ myAllowModification (Standard_True) void TDF_Data::Destroy() { AbortUntilTransaction(1); - delete myRoot; + myRoot->Destroy (myLabelNodeAllocator); + myRoot = NULL; } diff --git a/src/TDF/TDF_Label.cxx b/src/TDF/TDF_Label.cxx index d37eeefbba..fc62badde7 100755 --- a/src/TDF/TDF_Label.cxx +++ b/src/TDF/TDF_Label.cxx @@ -17,14 +17,6 @@ // purpose or non-infringement. Please see the License for the specific terms // and conditions governing the rights and limitations under the License. -// -------------- - -// Version: 0.0 -//Version Date Purpose -// 0.0 Feb 6 1997 Creation - - - #include #include @@ -364,10 +356,8 @@ TDF_LabelNode* TDF_Label::FindOrAddChild } else if (create) { // Creates the label to be inserted always before currentLnp. - const Handle(NCollection_IncAllocator)& anIncAllocator = - (const Handle(NCollection_IncAllocator)&) - myLabelNode ->Data() -> LabelNodeAllocator(); - childLabelNode = new (anIncAllocator) TDF_LabelNode (aTag, myLabelNode); + const TDF_HAllocator& anAllocator = myLabelNode->Data()->LabelNodeAllocator(); + childLabelNode = new (anAllocator) TDF_LabelNode (aTag, myLabelNode); childLabelNode->myBrother = currentLnp; // May be NULL. childLabelNode->Imported(IsImported()); //Inserts the label: diff --git a/src/TDF/TDF_LabelNode.cxx b/src/TDF/TDF_LabelNode.cxx index 956a415ea8..28702bd00b 100755 --- a/src/TDF/TDF_LabelNode.cxx +++ b/src/TDF/TDF_LabelNode.cxx @@ -17,14 +17,6 @@ // purpose or non-infringement. Please see the License for the specific terms // and conditions governing the rights and limitations under the License. -// ------------------ - -// Version: 0.0 -//Version Date Purpose -// 0.0 Feb 6 1997 Creation -// MSV 21.03.2003: protect against stack overflow in destructor - - #include #include @@ -88,21 +80,25 @@ TDF_LabelNode::TDF_LabelNode } //======================================================================= -//function : ~TDF_LabelNode +//function : Destroy //purpose : //======================================================================= -TDF_LabelNode::~TDF_LabelNode() +void TDF_LabelNode::Destroy (const TDF_HAllocator& theAllocator) { // MSV 21.03.2003: do not delete brother, rather delete all children in a loop // to avoid stack overflow while (myFirstChild != NULL) { TDF_LabelNode* aSecondChild = myFirstChild->Brother(); - delete myFirstChild; + myFirstChild->Destroy (theAllocator); myFirstChild = aSecondChild; } myFirstAttribute.Nullify(); - myLastFoundChild = NULL; //jfa 10.01.2003 + myFather = myBrother = myFirstChild = myLastFoundChild = NULL; + myTag = myFlags = 0; + + // deallocate memory (does nothing for IncAllocator) + theAllocator->Free (this); } //======================================================================= diff --git a/src/TDF/TDF_LabelNode.hxx b/src/TDF/TDF_LabelNode.hxx index c30cdd9cac..948d9e6baf 100755 --- a/src/TDF/TDF_LabelNode.hxx +++ b/src/TDF/TDF_LabelNode.hxx @@ -17,21 +17,14 @@ // purpose or non-infringement. Please see the License for the specific terms // and conditions governing the rights and limitations under the License. -// ------------------ - -// Version: 0.0 -//Version Date Purpose -// 0.0 Feb 6 1997 Creation - -//#include - #ifndef TDF_LabelNode_HeaderFile #define TDF_LabelNode_HeaderFile #include #include #include -#include +#include +#include class TDF_Attribute; class TDF_AttributeIterator; @@ -114,24 +107,17 @@ class TDF_LabelNode { inline Standard_Boolean MayBeModified() const { return ((myFlags & TDF_LabelNodeMayModMsk) != 0); }; - // Constructor - TDF_LabelNode(TDF_Data* Data); // Useful for root node. - - // Destructor - ~TDF_LabelNode(); + private : // Memory management - void * operator new (size_t aSize, - const Handle(NCollection_IncAllocator)& anAlloc) - { return anAlloc -> Allocate (aSize); } -#if !defined(__BORLANDC__) && (!defined(__SUNPRO_CC) || (__SUNPRO_CC > 0x530)) - void operator delete (void* theAddress, - const Handle(NCollection_IncAllocator)& anAlloc) - { - } -#endif - void operator delete(void *) { } - // nothing to do in operator delete since IncAllocator does not need it + DEFINE_NCOLLECTION_ALLOC + + // Constructor + TDF_LabelNode(TDF_Data* Data); + + // Destructor and deallocator + void Destroy (const TDF_HAllocator& theAllocator); + // Public Friends // -------------------------------------------------------------------------- @@ -140,8 +126,6 @@ class TDF_LabelNode { private : - void* operator new(size_t); - // Private Methods // --------------------------------------------------------------------------