X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSMESH%2FSMESH_Gen.hxx;h=77b3cfc23b44ad04868152d093bf38eabe538dbf;hb=455afe36e4542c56ad944b1c01b4c63c4316d1e9;hp=3a01de04c4386bbb5d4436f6318d313d3b0e238a;hpb=bc37f0b49f9713347749b6325e1c7062de8857ae;p=modules%2Fsmesh.git 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;