X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FDriverMED%2FDriverMED_Family.cxx;h=d682304fe699f98ffc30fabd6cbc359d9cafc5d4;hp=42f2f6aa3b148427484d0d853b562ecfd1a9bb41;hb=251f8c052dd12dd29922210dc901b295fe999a0e;hpb=b0a908c0d20341651771d0249fb10882f54b2aad diff --git a/src/DriverMED/DriverMED_Family.cxx b/src/DriverMED/DriverMED_Family.cxx index 42f2f6aa3..d682304fe 100644 --- a/src/DriverMED/DriverMED_Family.cxx +++ b/src/DriverMED/DriverMED_Family.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2015 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 @@ -145,7 +145,7 @@ DriverMED_Family //============================================================================= DriverMED_FamilyPtrList DriverMED_Family -::MakeFamilies(const SMESHDS_SubMeshPtrMap& theSubMeshes, +::MakeFamilies(SMESHDS_SubMeshIteratorPtr theSubMeshes, const SMESHDS_GroupBasePtrList& theGroups, const bool doGroupOfNodes, const bool doGroupOfEdges, @@ -170,11 +170,10 @@ DriverMED_Family int aElemFamId = FIRST_ELEM_FAMILY; // Process sub-meshes - SMESHDS_SubMeshPtrMap::const_iterator aSMIter = theSubMeshes.begin(); - for (; aSMIter != theSubMeshes.end(); aSMIter++) + while ( theSubMeshes->more() ) { - const int anId = aSMIter->first; - SMESHDS_SubMesh* aSubMesh = aSMIter->second; + SMESHDS_SubMesh* aSubMesh = const_cast< SMESHDS_SubMesh* >( theSubMeshes->next() ); + const int anId = aSubMesh->GetID(); if ( aSubMesh->IsComplexSubmesh() ) continue; // submesh containing other submeshs DriverMED_FamilyPtrList aSMFams = SplitByType(aSubMesh,anId);