Updated copyright comment

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

diff --git a/src/HEXABLOCK/hexa_base.hxx b/src/HEXABLOCK/hexa_base.hxx
old mode 100755 (executable)
new mode 100644 (file)
index c0dfcbe..aee9961
--- a/src/HEXABLOCK/hexa_base.hxx
+++ b/src/HEXABLOCK/hexa_base.hxx
@@ -1,12 +1,12 @@
 
 // Incl : Common definitions for HEXA-BLOCK
 
-// 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
@@ -17,8 +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.salome-platform.org/
-// or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #define DumpActif true
@@ -84,13 +83,12 @@ typedef FILE*       pfile;
 typedef const std::string& rcstring;
                        // Impressions de mise au point
 #include <iostream>
-using namespace std;
 
-#define HexDisplay(x)   cout << " ... " #x " = " << x << endl
-#define PutData(x)      cout << " ... " #x " = " << x << endl
-#define PutCoord(x)     cout << " ... " #x " = (" << x[0] << ", " \
-                              << x[1] << ", " << x[2] << ")"  << endl
-#define Echo(m)         cout << " _______________ " << m << endl
+#define HexDisplay(x)   std::cout << " ... " #x " = " << x << std::endl
+#define PutData(x)      std::cout << " ... " #x " = " << x << std::endl
+#define PutCoord(x)     std::cout << " ... " #x " = (" << x[0] << ", " \
+                              << x[1] << ", " << x[2] << ")"  << std::endl
+#define Echo(m)         std::cout << " _______________ " << m << std::endl
 
 //  #define Libere(obj)     { if (obj!=NULL) free (obj)      ;  obj=NULL; }
 //  #define Destroy(obj)    { delete obj       ;  obj=NULL   ;            }
@@ -280,15 +278,15 @@ HexaExport bool   on_debug();     // == getenv ("HEXA_DB") > 0
 HexaExport bool   in_test ();     // == getenv ("HEXA_TEST") > 0
 HexaExport int    niv_debug();    // Implemente prochainement
 
-HexaExport void   set_minus (string& chaine);
+HexaExport void   set_minus (std::string& chaine);
 
 HexaExport bool   special_option ();
 HexaExport void   set_special_option (bool opt);
 
 HexaExport int    sizeof_file (cpchar filename);
 HexaExport char*  read_file   (cpchar filename, int& size);
-HexaExport cpchar get_time   (string& buffer);
-HexaExport int make_basename (cpchar filename, string& base);
+HexaExport cpchar get_time   (std::string& buffer);
+HexaExport int make_basename (cpchar filename, std::string& base);
 
 const double Epsil   = 1e-6;
 const double UnEpsil = 0.999999;