X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHDS%2FSMESHDS_Hypothesis.hxx;h=9fb413fbd80dc9b57d283be095575f66432b569b;hb=ea3e3193e3d50a44a4b3a069fc4fc1239c22f27b;hp=3a79039b8d1b3136c48fa5ae8776fc16dc8da0fd;hpb=c3bf92bd87b770fd81631a3853f7f5bb1ac6a4e8;p=modules%2Fsmesh.git diff --git a/src/SMESHDS/SMESHDS_Hypothesis.hxx b/src/SMESHDS/SMESHDS_Hypothesis.hxx index 3a79039b8..9fb413fbd 100644 --- a/src/SMESHDS/SMESHDS_Hypothesis.hxx +++ b/src/SMESHDS/SMESHDS_Hypothesis.hxx @@ -29,16 +29,8 @@ #ifndef _SMESHDS_HYPOTHESIS_HXX_ #define _SMESHDS_HYPOTHESIS_HXX_ -#if (__GNUC__>2) #include -#include -#include -#else -#include -#include -#include -#endif -using namespace std; +#include class SMESHDS_Hypothesis { @@ -50,13 +42,13 @@ public: int GetID() const; int GetType() const; - virtual ostream & SaveTo(ostream & save)=0; - virtual istream & LoadFrom(istream & load)=0; + virtual std::ostream & SaveTo(std::ostream & save)=0; + virtual std::istream & LoadFrom(std::istream & load)=0; enum hypothesis_type {PARAM_ALGO, ALGO, ALGO_1D, ALGO_2D, ALGO_3D}; protected: - string _name; + std::string _name; int _hypId; int _type; };