From: eap Date: Wed, 24 Apr 2013 12:59:33 +0000 (+0000) Subject: Regression of XSMESH_TEST/SMESHCOMMON/SMESH_TEST/Grids/smesh/bugs12/M6 X-Git-Tag: V7_2_0~9 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=85cd6043817a6218e3ff7c01b62f247d791a434f;p=modules%2Fsmesh.git Regression of XSMESH_TEST/SMESHCOMMON/SMESH_TEST/Grids/smesh/bugs12/M6 To assure stability of makeWalls(), use maps sorted by ID, that are declared in SMESH_TypeDefs.hxx -typedef map > TElemOfNodeListMap; -typedef map > TElemOfElemListMap; --- diff --git a/src/SMESH/SMESH_MeshEditor.cxx b/src/SMESH/SMESH_MeshEditor.cxx index 8ae8331ab..f5bc661fb 100644 --- a/src/SMESH/SMESH_MeshEditor.cxx +++ b/src/SMESH/SMESH_MeshEditor.cxx @@ -107,9 +107,6 @@ using namespace std; using namespace SMESH::Controls; -typedef map > TElemOfNodeListMap; -typedef map > TElemOfElemListMap; - typedef SMDS_SetIterator< SMDS_pElement, TIDSortedElemSet::const_iterator> TSetIterator; //======================================================================= @@ -6028,8 +6025,8 @@ SMESH_MeshEditor::generateGroups(const SMESH_SequenceOfElemPtr& nodeGens, const SMDSAbs_ElementType type = groupDS->GetType(); SMESHDS_Group* newGroup = new SMESHDS_Group( newGroupID++, mesh->GetMeshDS(), type ); SMESHDS_Group* newTopGroup = new SMESHDS_Group( newGroupID++, mesh->GetMeshDS(), type ); - groupsByType[ groupDS->GetType() ].push_back( make_tuple( groupDS, newGroup, newTopGroup )); - orderedOldNewGroups.push_back( & groupsByType[ groupDS->GetType() ].back() ); + groupsByType[ type ].push_back( make_tuple( groupDS, newGroup, newTopGroup )); + orderedOldNewGroups.push_back( & groupsByType[ type ].back() ); } // Loop on nodes and elements to add them in new groups