NPAL16132 (GHS3D execution failed in Salome version 4.0.0)

[modules/smesh.git] / src / SMESHDS / SMESHDS_Hypothesis.hxx

diff --git a/src/SMESHDS/SMESHDS_Hypothesis.hxx b/src/SMESHDS/SMESHDS_Hypothesis.hxx
index b5c414a25b42b15cc225f9223ff837ef65f5b57d..2b09ed32872dc755915848f5e0c0df0124822282 100644 (file)
--- a/src/SMESHDS/SMESHDS_Hypothesis.hxx
+++ b/src/SMESHDS/SMESHDS_Hypothesis.hxx
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software 
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 // 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -29,18 +29,12 @@
 #ifndef _SMESHDS_HYPOTHESIS_HXX_
 #define _SMESHDS_HYPOTHESIS_HXX_
 
-#if (__GNUC__>2)
-#include <string>
-#include <istream>
-#include <ostream>
-#else 
+#include "SMESH_SMESHDS.hxx"
+
 #include <string>
-#include <istream.h>
-#include <ostream.h>
-#endif
-using namespace std;  
+#include <iostream>
 
-class SMESHDS_Hypothesis
+class SMESHDS_EXPORT SMESHDS_Hypothesis
 {
 public:
   SMESHDS_Hypothesis(int hypId);
@@ -48,16 +42,15 @@ public:
 
   const char* GetName() const;
   int GetID() const;
-  void SetID(int id);
   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};
+enum hypothesis_type {PARAM_ALGO, ALGO_0D, ALGO_1D, ALGO_2D, ALGO_3D};
 
 protected:
-  string _name;
+  std::string _name;
   int _hypId;
   int _type;
 };