Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Suppress memory leak when using Kernel_Utils::decode()
[modules/smesh.git]
/
src
/
SMESHUtils
/
SMESH_TypeDefs.hxx
diff --git
a/src/SMESHUtils/SMESH_TypeDefs.hxx
b/src/SMESHUtils/SMESH_TypeDefs.hxx
index 294a8aece434bd2266671c62a9a3d4c0af4f90cc..a682b894d091099d6b11f8cfed9017cee05dc43b 100644
(file)
--- a/
src/SMESHUtils/SMESH_TypeDefs.hxx
+++ b/
src/SMESHUtils/SMESH_TypeDefs.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
19
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-32,6
+32,8
@@
#include "SMDS_SetIterator.hxx"
#include "SMDS_MeshNode.hxx"
#include "SMDS_SetIterator.hxx"
#include "SMDS_MeshNode.hxx"
+#include <smIdType.hxx>
+
#include <gp_XYZ.hxx>
#include <gp_XY.hxx>
#include <gp_XYZ.hxx>
#include <gp_XY.hxx>
@@
-102,6
+104,8
@@
namespace SMESHUtils
TOBJ* _obj;
ArrayDeleter( TOBJ* obj ): _obj( obj ) {}
~ArrayDeleter() { delete [] _obj; _obj = 0; }
TOBJ* _obj;
ArrayDeleter( TOBJ* obj ): _obj( obj ) {}
~ArrayDeleter() { delete [] _obj; _obj = 0; }
+ operator TOBJ*() { return _obj; }
+ TOBJ* get() { return _obj; }
private:
ArrayDeleter( const ArrayDeleter& );
};
private:
ArrayDeleter( const ArrayDeleter& );
};
@@
-154,7
+158,7
@@
struct SMESH_TLink: public NLink
// methods for usage of SMESH_TLink as a hasher in NCollection maps
static int HashCode(const SMESH_TLink& link, int aLimit)
{
// methods for usage of SMESH_TLink as a hasher in NCollection maps
static int HashCode(const SMESH_TLink& link, int aLimit)
{
- return ::HashCode( link.node1()->GetID() + link.node2()->GetID(), aLimit );
+ return
smIdHasher
::HashCode( link.node1()->GetID() + link.node2()->GetID(), aLimit );
}
static Standard_Boolean IsEqual(const SMESH_TLink& l1, const SMESH_TLink& l2)
{
}
static Standard_Boolean IsEqual(const SMESH_TLink& l1, const SMESH_TLink& l2)
{
@@
-215,7
+219,7
@@
struct SMESH_Hasher
{
static Standard_Integer HashCode(const SMDS_MeshElement* e, const Standard_Integer upper)
{
{
static Standard_Integer HashCode(const SMDS_MeshElement* e, const Standard_Integer upper)
{
- return ::HashCode( e->GetID(), upper );
+ return
smIdHasher
::HashCode( e->GetID(), upper );
}
static Standard_Boolean IsEqual( const SMDS_MeshElement* e1, const SMDS_MeshElement* e2 )
{
}
static Standard_Boolean IsEqual( const SMDS_MeshElement* e1, const SMDS_MeshElement* e2 )
{