Merge with version on tag OCC-V2_1_0d

[modules/smesh.git] / src / SMDS / SMDS_VolumeOfFaces.hxx

diff --git a/src/SMDS/SMDS_VolumeOfFaces.hxx b/src/SMDS/SMDS_VolumeOfFaces.hxx
index 05480f3df0ea075ee98627bd000a7b24f5f1e6e7..4a78e366ed86fa4baedc7f4a26b90680d5194768 100644 (file)
--- a/src/SMDS/SMDS_VolumeOfFaces.hxx
+++ b/src/SMDS/SMDS_VolumeOfFaces.hxx
@@ -21,7 +21,7 @@
 //
 //
 //
-//  File   : SMDS_MeshVolume.hxx
+//  File   : SMDS_VolumeOfFaces.hxx
 //  Module : SMESH
 
 #ifndef _SMDS_VolumeOfFaces_HeaderFile
@@ -32,28 +32,35 @@
 #include "SMDS_Iterator.hxx"
 #include <vector>
 #include <iostream>
-using namespace std;
+
 
 class SMDS_VolumeOfFaces:public SMDS_MeshVolume
 {
        
   public:
-       SMDS_VolumeOfFaces(SMDS_MeshFace * face1, SMDS_MeshFace * face2,
-               SMDS_MeshFace * face3, SMDS_MeshFace * face4);
-       SMDS_VolumeOfFaces(SMDS_MeshFace * face1, SMDS_MeshFace * face2,
-               SMDS_MeshFace * face3, SMDS_MeshFace * face4,
-               SMDS_MeshFace * face5);
-       SMDS_VolumeOfFaces(SMDS_MeshFace * face1, SMDS_MeshFace * face2,
-               SMDS_MeshFace * face3, SMDS_MeshFace * face4,
-               SMDS_MeshFace * face5,SMDS_MeshFace * face6);
+       SMDS_VolumeOfFaces(const SMDS_MeshFace * face1,
+                           const SMDS_MeshFace * face2,
+                           const SMDS_MeshFace * face3,
+                           const SMDS_MeshFace * face4);
+       SMDS_VolumeOfFaces(const SMDS_MeshFace * face1,
+                           const SMDS_MeshFace * face2,
+                           const SMDS_MeshFace * face3,
+                           const SMDS_MeshFace * face4,
+                           const SMDS_MeshFace * face5);
+       SMDS_VolumeOfFaces(const SMDS_MeshFace * face1,
+                           const SMDS_MeshFace * face2,
+                           const SMDS_MeshFace * face3,
+                           const SMDS_MeshFace * face4,
+                           const SMDS_MeshFace * face5,
+                           const SMDS_MeshFace * face6);
 
-       void Print(ostream & OS) const;
+       void Print(std::ostream & OS) const;
        
        int NbFaces() const;
 
   protected:
-       SMDS_Iterator<const SMDS_MeshElement *> *
+       SMDS_ElemIteratorPtr
                elementsIterator(SMDSAbs_ElementType type) const;
-       vector<SMDS_MeshFace *> myFaces;
+       std::vector<const SMDS_MeshFace *> myFaces;
 };
 #endif