#24666 [CEA][Windows] BLSURPLUGIN compilation issue

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

diff --git a/src/SMESHDS/SMESHDS_Hypothesis.hxx b/src/SMESHDS/SMESHDS_Hypothesis.hxx
index 85e115c05d149150d026b3b0f07fb479cddd4e32..5ecf507890f87e83732242befa193168833a8354 100644 (file)
--- a/src/SMESHDS/SMESHDS_Hypothesis.hxx
+++ b/src/SMESHDS/SMESHDS_Hypothesis.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -39,22 +39,26 @@ class SMESHDS_EXPORT SMESHDS_Hypothesis
   SMESHDS_Hypothesis(int hypId);
   virtual ~SMESHDS_Hypothesis();
 
+  enum hypothesis_type { PARAM_ALGO, ALGO_0D, ALGO_1D, ALGO_2D, ALGO_3D };
+
   const char* GetName() const;
-  int GetID() const;
-  int GetType() const;
+  int         GetID()   const;
+  int         GetType() const;
 
   virtual std::ostream & SaveTo(std::ostream & save)=0;
   virtual std::istream & LoadFrom(std::istream & load)=0;
 
+  static void SaveStringToStream(std::ostream & save, const std::string& txt );
+  static bool LoadStringFromStream(std::istream & load, std::string&       txt );
+
+  bool IsSameName( const SMESHDS_Hypothesis& other) const;
   virtual bool operator==(const SMESHDS_Hypothesis& other) const;
   bool operator!=(const SMESHDS_Hypothesis& other) const { return !(*this==other); }
 
-  enum hypothesis_type { PARAM_ALGO, ALGO_0D, ALGO_1D, ALGO_2D, ALGO_3D };
-
  protected:
-  std::string _name;  // identifier if hypothesis type
-  int         _hypId; // ID unique within application session
-  int         _type;  // enum hypothesis_type
+  std::string     _name;  // identifier of hypothesis type
+  int             _hypId; // ID unique within application session
+  hypothesis_type _type;  // enum hypothesis_type
 };
 
 #endif