Mesh redesine. New fields added to specify whether hypothesis is main or additional...

[modules/smesh.git] / src / SMESH / SMESH_Gen.hxx

diff --git a/src/SMESH/SMESH_Gen.hxx b/src/SMESH/SMESH_Gen.hxx
index 3a01de04c4386bbb5d4436f6318d313d3b0e238a..17dbe35e63070eb57b0dbbd36bdd81b74d7ed242 100644 (file)
--- a/src/SMESH/SMESH_Gen.hxx
+++ b/src/SMESH/SMESH_Gen.hxx
@@ -43,12 +43,12 @@
 #include <TopoDS_Shape.hxx>
 
 #include <map>
-using namespace std;
+
 
 typedef struct studyContextStruct
 {
-       map < int, SMESH_Hypothesis * >mapHypothesis;
-         map < int, SMESH_Mesh * >mapMesh;
+       std::map < int, SMESH_Hypothesis * >mapHypothesis;
+         std::map < int, SMESH_Mesh * >mapMesh;
          SMESHDS_Document * myDocument;
 } StudyContextStruct;
 
@@ -75,7 +75,7 @@ class SMESH_Gen
   static int GetShapeDim(const TopoDS_Shape & aShape)
   { return GetShapeDim( aShape.ShapeType() ); }
   SMESH_Algo* GetAlgo(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape);
-  static bool IsGlobalAlgo(const SMESH_Algo* theAlgo, SMESH_Mesh& aMesh);
+  static bool IsGlobalHypothesis(const SMESH_Hypothesis* theHyp, SMESH_Mesh& aMesh);
 
   // inherited methods from SALOMEDS::Driver
 
@@ -89,15 +89,15 @@ class SMESH_Gen
 
   int GetANewId();
 
-  map < int, SMESH_Algo * >_mapAlgo;
-  map < int, SMESH_1D_Algo * >_map1D_Algo;
-  map < int, SMESH_2D_Algo * >_map2D_Algo;
-  map < int, SMESH_3D_Algo * >_map3D_Algo;
+  std::map < int, SMESH_Algo * >_mapAlgo;
+  std::map < int, SMESH_1D_Algo * >_map1D_Algo;
+  std::map < int, SMESH_2D_Algo * >_map2D_Algo;
+  std::map < int, SMESH_3D_Algo * >_map3D_Algo;
 
  private:
 
   int _localId;                                // unique Id of created objects, within SMESH_Gen entity
-  map < int, StudyContextStruct * >_mapStudyContext;
+  std::map < int, StudyContextStruct * >_mapStudyContext;
 
   // hypotheses managing
   int _hypId;