OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0023002: empty delete operator in TDF_LabelNode

Browse Source 
Destruction of TDF_LabelNode class corrected so as to use consistently defined new/delete operators
This commit is contained in:
abv 2012-04-12 10:25:59 +04:00 committed by bugmaster
parent 6de552e6c4
commit 60d4560d17
5 changed files with 27 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/NCollection/NCollection_DefineAlloc.hxx
View File

@ -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 <NCollection_BaseAllocator.hxx>
// 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.

13
src/TDF/TDF_Data.cxx
View File

@ -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 <TDF_Data.ixx>
#include <TCollection_AsciiString.hxx>
@ -48,6 +40,8 @@
#include <Standard_NoMoreObject.hxx>
#include <Standard_NullObject.hxx>
#include <NCollection_IncAllocator.hxx>
#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;
}

14
src/TDF/TDF_Label.cxx
View File

@ -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 <TDF_Label.ixx>
#include <TDF_Attribute.hxx>
@ -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:

20
src/TDF/TDF_LabelNode.cxx
View File

@ -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 <TDF_LabelNode.hxx>
#include <TDF_Data.hxx>
@ -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);
}
//=======================================================================

38
src/TDF/TDF_LabelNode.hxx
View File

@ -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 <TDF_Data.hxx>
#ifndef TDF_LabelNode_HeaderFile
#define TDF_LabelNode_HeaderFile
#include <TCollection_AsciiString.hxx>
#include <TDF_Attribute.hxx>
#include <TDF_LabelNodePtr.hxx>
#include <NCollection_IncAllocator.hxx>
#include <TDF_HAllocator.hxx>
#include <NCollection_DefineAlloc.hxx>
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
// --------------------------------------------------------------------------