X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHDS%2FSMESHDS_Hypothesis.hxx;h=9fb413fbd80dc9b57d283be095575f66432b569b;hp=3a79039b8d1b3136c48fa5ae8776fc16dc8da0fd;hb=0febe018bcde111dc7aca1f3e44d4aa2995b59a2;hpb=c3bf92bd87b770fd81631a3853f7f5bb1ac6a4e8

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 <string>
-#include <istream>
-#include <ostream>
-#else 
-#include <string>
-#include <istream.h>
-#include <ostream.h>
-#endif
-using namespace std;  
+#include <iostream>
 
 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;
 };