X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSMESHDS%2FSMESHDS_Hypothesis.hxx;h=9fb413fbd80dc9b57d283be095575f66432b569b;hb=2387bfa403855b82751bf9f122295b1fc6923a18;hp=b6e21c2cd03d288175c7da156146e58a8a55b337;hpb=789d7f7415a1e465aee36232e7633eea548ff1fb;p=modules%2Fsmesh.git

diff --git a/src/SMESHDS/SMESHDS_Hypothesis.hxx b/src/SMESHDS/SMESHDS_Hypothesis.hxx
index b6e21c2cd..9fb413fbd 100644
--- a/src/SMESHDS/SMESHDS_Hypothesis.hxx
+++ b/src/SMESHDS/SMESHDS_Hypothesis.hxx
@@ -29,18 +29,8 @@
 #ifndef _SMESHDS_HYPOTHESIS_HXX_
 #define _SMESHDS_HYPOTHESIS_HXX_
 
-#if (__GNUC__>2)
 #include <string>
-#include <istream>
-#include <ostream>
-#else 
-#include <string>
-#include <istream.h>
-#include <ostream.h>
-#endif
-  
-// class istream;
-// class ostream;
+#include <iostream>
 
 class SMESHDS_Hypothesis
 {
@@ -48,17 +38,17 @@ public:
   SMESHDS_Hypothesis(int hypId);
   virtual ~SMESHDS_Hypothesis();
 
-  const char* GetName();
-  int GetID();
-  int GetType();
+  const char* GetName() const;
+  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;
 };