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=878eb54685a1b2aacc72787ed762efb8bff3c7bd;hb=2387bfa403855b82751bf9f122295b1fc6923a18;hpb=8b4ba0cdff7660465a9ea7b26ef0df0757afed97

diff --git a/src/SMESHDS/SMESHDS_Hypothesis.hxx b/src/SMESHDS/SMESHDS_Hypothesis.hxx
index 878eb5468..9fb413fbd 100644
--- a/src/SMESHDS/SMESHDS_Hypothesis.hxx
+++ b/src/SMESHDS/SMESHDS_Hypothesis.hxx
@@ -1,27 +1,36 @@
-//=============================================================================
-// File      : SMESHDS_Hypothesis.hxx
-// Created   : sam mai 18 08:07:54 CEST 2002
-// Author    : Paul RASCLE, EDF
-// Project   : SALOME
-// Copyright : EDF 2002
-// $Header$
-//=============================================================================
+//  SMESH SMESHDS : management of mesh data and SMESH document
+//
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+// 
+//  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. 
+// 
+//  This library is distributed in the hope that it will be useful, 
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+//  Lesser General Public License for more details. 
+// 
+//  You should have received a copy of the GNU Lesser General Public 
+//  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 
+//
+//
+//
+//  File   : SMESHDS_Hypothesis.hxx
+//  Author : Paul RASCLE, EDF
+//  Module : SMESH
+//  $Header$
 
 #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
 {
@@ -29,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;
 };