Updated copyright comment

[modules/hexablock.git] / src / HEXABLOCK / HexShape.hxx

diff --git a/src/HEXABLOCK/HexShape.hxx b/src/HEXABLOCK/HexShape.hxx
old mode 100755 (executable)
new mode 100644 (file)
index 94d3070..2336ed0
--- a/src/HEXABLOCK/HexShape.hxx
+++ b/src/HEXABLOCK/HexShape.hxx
@@ -1,12 +1,12 @@
 
 // class : Gestion des formes associees
 
-// Copyright (C) 2009-2013  CEA/DEN, EDF R&D
+// Copyright (C) 2009-2024  CEA, EDF
 //
 // 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
@@ -23,26 +23,25 @@
 #ifndef __SHAPE_H_
 #define __SHAPE_H_
 
-#include "Hex_defines.hxx"
 #include "hexa_base.hxx"
 
 BEGIN_NAMESPACE_HEXA
 
-class HEXABLOCKENGINE_EXPORT Shape 
+class HexaExport Shape 
 {
 public :
-    Shape (string brep);
-    string getBrep  () { return b_rep; }
-    string getIdent () { return ident; }
-    string getIor   () { return ior; }
+    Shape (std::string brep);
+    std::string getBrep  () { return b_rep; }
+    std::string getIdent () { return ident; }
+    std::string getIor   () { return ior; }
 
     double getStart () { return debut;  }
     double getEnd   () { return fin;   }
     void   getBounds (double& pdeb, double& pfin)  { pdeb=debut ; pfin = fin; }
 
-    void  setBrep   (string brep)               { b_rep = brep; }
-    void  setIdent  (string name)               { ident = name; }
-    void  setIor    (string val)                { ior   = val; }
+    void  setBrep   (std::string brep)               { b_rep = brep; }
+    void  setIdent  (std::string name)               { ident = name; }
+    void  setIor    (std::string val)                { ior   = val; }
 
     void  setBounds (double pdeb, double pfin)  { debut = pdeb ; fin = pfin; }
     void  setStart  (double val)                { debut = val ; }
@@ -53,8 +52,8 @@ public :
 private :
     double debut;
     double fin;
-    string ident;
-    string ior;
+    std::string ident;
+    std::string ior;
 
     std::string b_rep;
 };