X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMDS%2FSMDS_IteratorOfElements.hxx;h=faf777de98d633502d95f7a16701222a738a511d;hb=e4be7441d248ff060938edc0384d08767805b9c3;hp=5d2d3700c0e4c52c986e4a4477e310c233e6e3e7;hpb=ec6221e48c7b7c6ee6e11008d57d0bfc0dd41992;p=modules%2Fsmesh.git

diff --git a/src/SMDS/SMDS_IteratorOfElements.hxx b/src/SMDS/SMDS_IteratorOfElements.hxx
index 5d2d3700c..faf777de9 100644
--- a/src/SMDS/SMDS_IteratorOfElements.hxx
+++ b/src/SMDS/SMDS_IteratorOfElements.hxx
@@ -23,9 +23,8 @@
 #include "SMDS_MeshElement.hxx"
 #include <set>
 
-using namespace std;
 
-class SMDS_IteratorOfElements:public SMDS_Iterator<const SMDS_MeshElement *>
+class SMDS_IteratorOfElements:public SMDS_ElemIterator
 {
   public:
 /////////////////////////////////////////////////////////////////////////////
@@ -33,21 +32,21 @@ class SMDS_IteratorOfElements:public SMDS_Iterator<const SMDS_MeshElement *>
 /// to the element element. it is the iterator to get connectivity of element
 //////////////////////////////////////////////////////////////////////////////
 	SMDS_IteratorOfElements(const SMDS_MeshElement * element,
-		SMDSAbs_ElementType type, SMDS_Iterator<const SMDS_MeshElement *>* it);
+                                SMDSAbs_ElementType type,
+                                const SMDS_ElemIteratorPtr& it);
 	bool more();
 	const SMDS_MeshElement * next();
-	~SMDS_IteratorOfElements();
 
   private:
-	SMDS_Iterator<const SMDS_MeshElement *> * t2Iterator;
-	SMDS_Iterator<const SMDS_MeshElement *> * t1Iterator;
+	SMDS_ElemIteratorPtr t2Iterator;
+	SMDS_ElemIteratorPtr t1Iterator;
 	SMDSAbs_ElementType myType;	
 	const SMDS_MeshElement * myProxyElement;
 	const SMDS_MeshElement * myElement;		
 	bool myReverseIteration;
 
-	set<const SMDS_MeshElement*> alreadyReturnedElements;
-	set<const SMDS_MeshElement*>::iterator itAlreadyReturned;	
+	std::set<const SMDS_MeshElement*> alreadyReturnedElements;
+	std::set<const SMDS_MeshElement*>::iterator itAlreadyReturned;	
 	bool subMore();
 	const SMDS_MeshElement * subNext();
 };