X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMDS%2FSMDS_QuadraticFaceOfNodes.cxx;h=de4dbb47427c479675657e4ad0c61dae0a0ddbe2;hp=43093dafb2e29cbd1a543263535ba0e1421d7144;hb=c448c8ff749619177a1c040b92b9c28688f052b9;hpb=010ee1ec7117bb420679a7babf0955b517a05015 diff --git a/src/SMDS/SMDS_QuadraticFaceOfNodes.cxx b/src/SMDS/SMDS_QuadraticFaceOfNodes.cxx index 43093dafb..de4dbb474 100644 --- a/src/SMDS/SMDS_QuadraticFaceOfNodes.cxx +++ b/src/SMDS/SMDS_QuadraticFaceOfNodes.cxx @@ -192,21 +192,6 @@ namespace { } }; - //======================================================================= - //class : _MyInterlacedNodeElemIterator - //purpose : - //======================================================================= - - class _MyInterlacedNodeElemIterator : public SMDS_ElemIterator - { - SMDS_NodeIteratorPtr myItr; - public: - _MyInterlacedNodeElemIterator(SMDS_NodeIteratorPtr interlacedNodeItr): - myItr( interlacedNodeItr ) {} - bool more() { return myItr->more(); } - const SMDS_MeshElement* next() { return myItr->next(); } - }; - //======================================================================= //class : _MyNodeIterator //purpose : @@ -234,16 +219,6 @@ SMDS_NodeIteratorPtr SMDS_QuadraticFaceOfNodes::interlacedNodesIterator() const (new _MyInterlacedNodeIterator (myNodes, myNodes.size()==6 ? triaInterlace : quadInterlace)); } -//======================================================================= -//function : interlacedNodesElemIterator -//purpose : -//======================================================================= - -SMDS_ElemIteratorPtr SMDS_QuadraticFaceOfNodes::interlacedNodesElemIterator() const -{ - return SMDS_ElemIteratorPtr - (new _MyInterlacedNodeElemIterator ( interlacedNodesIterator() )); -} /// =================================================================== /*! * \brief Iterator on edges of face @@ -257,10 +232,10 @@ class _MyEdgeIterator : public SMDS_ElemIterator public: _MyEdgeIterator(const SMDS_QuadraticFaceOfNodes* face):myIndex(0) { myElems.reserve( face->NbNodes() ); - SMDS_ElemIteratorPtr nIt = face->interlacedNodesElemIterator(); + SMDS_NodeIteratorPtr nIt = face->interlacedNodesIterator(); const SMDS_MeshNode* n0 = face->GetNodeWrap( -1 ); while ( nIt->more() ) { - const SMDS_MeshNode* n1 = static_cast( nIt->next() ); + const SMDS_MeshNode* n1 = nIt->next(); const SMDS_MeshElement* edge = SMDS_Mesh::FindEdge( n0, n1 ); if ( edge ) myElems.push_back( edge );