X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH%2FSMESH_Gen.hxx;h=77b3cfc23b44ad04868152d093bf38eabe538dbf;hp=3a01de04c4386bbb5d4436f6318d313d3b0e238a;hb=0febe018bcde111dc7aca1f3e44d4aa2995b59a2;hpb=0de991099a7f8bea2687d44c20021be3066f3615;ds=sidebyside diff --git a/src/SMESH/SMESH_Gen.hxx b/src/SMESH/SMESH_Gen.hxx index 3a01de04c..77b3cfc23 100644 --- a/src/SMESH/SMESH_Gen.hxx +++ b/src/SMESH/SMESH_Gen.hxx @@ -43,12 +43,12 @@ #include #include -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; @@ -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;