ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-11-15 10:08:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix vagrind error at incrementing an iterator pointing to a deleted

Browse Source 
map node
This commit is contained in:
eap 2012-07-27 08:26:18 +00:00
parent b3abeea3ba
commit 84cb6968f2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/StdMeshers/StdMeshers_CompositeHexa_3D.cxx
View File

@ -1100,21 +1100,22 @@ void _QuadFaceGrid::setBrothers( set< _QuadFaceGrid* >& notLocatedBrothers )
TopoDS_Vertex rightVertex = GetSide( Q_BOTTOM ).LastVertex(); TopoDS_Vertex rightVertex = GetSide( Q_BOTTOM ).LastVertex();
DUMP_VERT("1 right bottom Vertex: ",rightVertex ); DUMP_VERT("1 right bottom Vertex: ",rightVertex );
set< _QuadFaceGrid* >::iterator brIt, brEnd = notLocatedBrothers.end(); set< _QuadFaceGrid* >::iterator brIt, brEnd = notLocatedBrothers.end();
for ( brIt = notLocatedBrothers.begin(); !myRightBrother && brIt != brEnd; ++brIt ) for ( brIt = notLocatedBrothers.begin(); brIt != brEnd; ++brIt )
{ {
_QuadFaceGrid* brother = *brIt; _QuadFaceGrid* brother = *brIt;
TopoDS_Vertex brotherLeftVertex = brother->GetSide( Q_BOTTOM ).FirstVertex(); TopoDS_Vertex brotherLeftVertex = brother->GetSide( Q_BOTTOM ).FirstVertex();
DUMP_VERT( "brother left bottom: ", brotherLeftVertex ); DUMP_VERT( "brother left bottom: ", brotherLeftVertex );
if ( rightVertex.IsSame( brotherLeftVertex )) { if ( rightVertex.IsSame( brotherLeftVertex )) {
myRightBrother = brother; myRightBrother = brother;
notLocatedBrothers.erase( myRightBrother ); notLocatedBrothers.erase( brIt );
break;
} }
} }
// find upper brother // find upper brother
TopoDS_Vertex upVertex = GetSide( Q_LEFT ).FirstVertex(); TopoDS_Vertex upVertex = GetSide( Q_LEFT ).FirstVertex();
DUMP_VERT("1 left up Vertex: ",upVertex); DUMP_VERT("1 left up Vertex: ",upVertex);
brIt = notLocatedBrothers.begin(), brEnd = notLocatedBrothers.end(); brIt = notLocatedBrothers.begin(), brEnd = notLocatedBrothers.end();
for ( ; !myUpBrother && brIt != brEnd; ++brIt ) for ( ; brIt != brEnd; ++brIt )
{ {
_QuadFaceGrid* brother = *brIt; _QuadFaceGrid* brother = *brIt;
TopoDS_Vertex brotherLeftVertex = brother->GetSide( Q_BOTTOM ).FirstVertex(); TopoDS_Vertex brotherLeftVertex = brother->GetSide( Q_BOTTOM ).FirstVertex();
@ -1122,6 +1123,7 @@ void _QuadFaceGrid::setBrothers( set< _QuadFaceGrid* >& notLocatedBrothers )
if ( upVertex.IsSame( brotherLeftVertex )) { if ( upVertex.IsSame( brotherLeftVertex )) {
myUpBrother = brother; myUpBrother = brother;
notLocatedBrothers.erase( myUpBrother ); notLocatedBrothers.erase( myUpBrother );
break;
} }
} }
// recursive call // recursive call