X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMDS%2FSMDS_MeshElement.hxx;h=3d9d13afe40d2298918c7ccfb68d4d642f219a2b;hb=c21a157b9d128bf905d3a575d90fdbbb07ed3a2e;hp=d35e151bd4d249f5b2a69b3a7a4cebead2f893bd;hpb=484fe83a97f643207334576fbe08d4a90d67fd37;p=modules%2Fsmesh.git

diff --git a/src/SMDS/SMDS_MeshElement.hxx b/src/SMDS/SMDS_MeshElement.hxx
index d35e151bd..3d9d13afe 100644
--- a/src/SMDS/SMDS_MeshElement.hxx
+++ b/src/SMDS/SMDS_MeshElement.hxx
@@ -29,13 +29,12 @@
 	
 #include "SMDSAbs_ElementType.hxx"
 #include "SMDS_MeshObject.hxx"
-#include "SMDS_Iterator.hxx"
+#include "SMDS_ElemIterator.hxx"
 #include "SMDS_MeshElementIDFactory.hxx"
 
 #include <vector>
-#include <ostream>
+#include <iostream>
 
-using namespace std;
 class SMDS_MeshNode;
 class SMDS_MeshEdge;
 class SMDS_MeshFace;	
@@ -47,10 +46,10 @@ class SMDS_MeshElement:public SMDS_MeshObject
 {
 
   public:
-	SMDS_Iterator<const SMDS_MeshElement *> * nodesIterator() const;
-	SMDS_Iterator<const SMDS_MeshElement *> * edgesIterator() const;
-	SMDS_Iterator<const SMDS_MeshElement *> * facesIterator() const;
-	virtual SMDS_Iterator<const SMDS_MeshElement *> *
+	SMDS_ElemIteratorPtr nodesIterator() const;
+	SMDS_ElemIteratorPtr edgesIterator() const;
+	SMDS_ElemIteratorPtr facesIterator() const;
+	virtual SMDS_ElemIteratorPtr
 		elementsIterator(SMDSAbs_ElementType type) const;
 
 	virtual int NbNodes() const;
@@ -60,12 +59,12 @@ class SMDS_MeshElement:public SMDS_MeshObject
 
 	///Return the type of the current element
 	virtual SMDSAbs_ElementType GetType() const = 0;
-	friend ostream & operator <<(ostream & OS, const SMDS_MeshElement *);
+	friend std::ostream & operator <<(std::ostream & OS, const SMDS_MeshElement *);
 	friend bool SMDS_MeshElementIDFactory::BindID(int ID,SMDS_MeshElement*elem);
 
   protected:
 	SMDS_MeshElement(int ID=-1);
-	virtual void Print(ostream & OS) const;
+	virtual void Print(std::ostream & OS) const;
 	
   private:
 	int myID;