X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH%2FSMESH_Algo.hxx;h=029dc67117bb1df9746dd9e31b079f9ab10db8ae;hp=d19bd94f32a3ff6bef508b8d3c0880c041db7780;hb=e4737e85f0da6d3f90fd08f6be1c2825195fe16f;hpb=51569f091c2d18be76ea9bd3e68ca0247cc731c3 diff --git a/src/SMESH/SMESH_Algo.hxx b/src/SMESH/SMESH_Algo.hxx index d19bd94f3..029dc6711 100644 --- a/src/SMESH/SMESH_Algo.hxx +++ b/src/SMESH/SMESH_Algo.hxx @@ -37,7 +37,6 @@ #include #include #include -using namespace std; class SMESH_Gen; class SMESH_Mesh; @@ -48,14 +47,14 @@ class SMESH_Algo:public SMESH_Hypothesis SMESH_Algo(int hypId, int studyId, SMESH_Gen * gen); virtual ~ SMESH_Algo(); - const vector < string > &GetCompatibleHypothesis(); + const std::vector < std::string > &GetCompatibleHypothesis(); virtual bool CheckHypothesis(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape, SMESH_Hypothesis::Hypothesis_Status& aStatus) = 0; virtual bool Compute(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape) = 0; - virtual const list & + virtual const std::list & GetUsedHypothesis(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape); const list & @@ -83,9 +82,9 @@ class SMESH_Algo:public SMESH_Hypothesis protected: bool _onlyUnaryInput; bool _requireDescretBoundary; - vector _compatibleHypothesis; - list _appliedHypList; - list _usedHypList; + std::vector _compatibleHypothesis; + std::list _appliedHypList; + std::list _usedHypList; }; #endif