X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_Group_i.cxx;h=cee8097de05e935035dacd017674d05b22b34584;hb=c98d9fcd7f02c1f1f5c24dd3e709ed75228d66c4;hp=9d3b3ee021016c8152d2542ca1f3b325bc5609b9;hpb=7a65c9fad427b1ccba6b9ccae612296e5092a324;p=modules%2Fsmesh.git diff --git a/src/SMESH_I/SMESH_Group_i.cxx b/src/SMESH_I/SMESH_Group_i.cxx index 9d3b3ee02..cee8097de 100644 --- a/src/SMESH_I/SMESH_Group_i.cxx +++ b/src/SMESH_I/SMESH_Group_i.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 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 @@ -502,8 +502,8 @@ namespace */ //================================================================================ - void getNodesOfElements(SMDS_ElemIteratorPtr elemIt, - set& nodes) + void getNodesOfElements(SMDS_ElemIteratorPtr elemIt, + std::set& nodes) { while ( elemIt->more() ) { @@ -531,7 +531,7 @@ CORBA::Long SMESH_GroupBase_i::GetNumberOfNodes() { if ( myNbNodes < 0 || g->GetTic() != myGroupDSTic ) { - set nodes; + std::set nodes; getNodesOfElements( g->GetElements(), nodes ); myNbNodes = nodes.size(); myGroupDSTic = g->GetTic(); @@ -574,10 +574,10 @@ SMESH::long_array* SMESH_GroupBase_i::GetNodeIDs() SMESH::long_array_var aRes = new SMESH::long_array(); if ( SMESHDS_GroupBase* g = GetGroupDS()) { - set nodes; + std::set nodes; getNodesOfElements( g->GetElements(), nodes ); aRes->length( nodes.size() ); - set::iterator nIt = nodes.begin(), nEnd = nodes.end(); + std::set::iterator nIt = nodes.begin(), nEnd = nodes.end(); for ( int i = 0; nIt != nEnd; ++nIt, ++i ) aRes[i] = (*nIt)->GetID(); } @@ -918,7 +918,7 @@ SMESH::long_array* SMESH_GroupOnFilter_i::GetMeshInfo() if ( g->GetType() != SMDSAbs_Node ) { - vector< int > nbElems = static_cast< SMESHDS_GroupOnFilter* >( g )->GetMeshInfo(); + std::vector< int > nbElems = static_cast< SMESHDS_GroupOnFilter* >( g )->GetMeshInfo(); for ( size_t i = SMESH::Entity_Node; i < SMESH::Entity_Last; i++) if ( i < nbElems.size() ) aRes[i] = nbElems[ i ];