Updated copyright comment

[modules/hexablock.git] / src / HEXABLOCK / Hex.cxx

diff --git a/src/HEXABLOCK/Hex.cxx b/src/HEXABLOCK/Hex.cxx
old mode 100755 (executable)
new mode 100644 (file)
index 9e3f361..4df633b
--- a/src/HEXABLOCK/Hex.cxx
+++ b/src/HEXABLOCK/Hex.cxx
@@ -1,12 +1,12 @@
 
 // C++ : La clase principale de Hexa
 
-// 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
@@ -33,7 +33,7 @@ Hex* Hex::first_instance = NULL;
 // ======================================================== Constructeur
 Hex::Hex ()
 {
-   setlocale (LC_NUMERIC, "C");
+   //setlocale (LC_NUMERIC, "C"); // VSR 2020-03-11: commented out - initial locale has to be restored somewhere...
    glob = Globale::getInstance ();
 }
 // ======================================================== Destructeur
@@ -85,7 +85,7 @@ Document* Hex::addDocument (cpchar nomdoc)
    if (actif)
        glob->dump << nomdoc;
 
-   string name;
+   std::string name;
    makeName (nomdoc, name);
    Document* doc = new Document (name.c_str(), this);
 
@@ -160,7 +160,7 @@ Document* Hex::findDocument (cpchar name)
    return NULL;
 }
 // ======================================================== makeName
-void Hex::makeName (cpchar radical, string& name)
+void Hex::makeName (cpchar radical, std::string& name)
 {
    char cnum [8];
    int  numero = 0;