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
mise en place des tests
[modules/smesh.git]
/
src
/
SMESHDS
/
SMESHDS_TSubMeshHolder.hxx
diff --git
a/src/SMESHDS/SMESHDS_TSubMeshHolder.hxx
b/src/SMESHDS/SMESHDS_TSubMeshHolder.hxx
index b6fa226da3006dbaf377c5b004ff655652d299d3..d8ddaff8ebb6c7aa3c86a34a58e27fe860b33be6 100644
(file)
--- a/
src/SMESHDS/SMESHDS_TSubMeshHolder.hxx
+++ b/
src/SMESHDS/SMESHDS_TSubMeshHolder.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
14
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
@@
-54,7
+54,7
@@
public:
}
else
{
}
else
{
- if ( myVec.size() <= id )
+ if (
(int)
myVec.size() <= id )
myVec.resize( id+1, (SUBMESH*) NULL );
myVec[ id ] = sm;
}
myVec.resize( id+1, (SUBMESH*) NULL );
myVec[ id ] = sm;
}
@@
-68,18
+68,26
@@
public:
}
else
{
}
else
{
- return (SUBMESH*) ( id >= myVec.size() ? NULL : myVec[ id ]);
+ return (SUBMESH*) ( id >=
(int)
myVec.size() ? NULL : myVec[ id ]);
}
}
void DeleteAll()
{
for ( size_t i = 0; i < myVec.size(); ++i )
}
}
void DeleteAll()
{
for ( size_t i = 0; i < myVec.size(); ++i )
- delete myVec[i];
+ if ( SUBMESH* sm = myVec[i] )
+ {
+ myVec[i] = 0; // avoid access via Get(i)
+ delete sm;
+ }
myVec.clear();
typename std::map< int, SUBMESH* >::iterator i2sm = myMap.begin();
for ( ; i2sm != myMap.end(); ++i2sm )
myVec.clear();
typename std::map< int, SUBMESH* >::iterator i2sm = myMap.begin();
for ( ; i2sm != myMap.end(); ++i2sm )
- delete i2sm->second;
+ if ( SUBMESH* sm = i2sm->second )
+ {
+ i2sm->second = 0; // avoid access via Get(i)
+ delete sm;
+ }
myMap.clear();
}
int GetMinID() const
myMap.clear();
}
int GetMinID() const