Merge branch 'V9_9_BR'

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

diff --git a/src/HEXABLOCK/HexEltBase.cxx b/src/HEXABLOCK/HexEltBase.cxx
old mode 100755 (executable)
new mode 100644 (file)
index 727530d..41a4aeb
--- a/src/HEXABLOCK/HexEltBase.cxx
+++ b/src/HEXABLOCK/HexEltBase.cxx
@@ -1,12 +1,12 @@
 
 // C++ : Element de base
 
-// Copyright (C) 2009-2013  CEA/DEN, EDF R&D
+// Copyright (C) 2009-2022  CEA/DEN, EDF R&D
 //
 // 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
@@ -128,14 +128,9 @@ void EltBase::printName  (cpchar sep)
 // ========================================================= dumpRef
 void EltBase::dumpRef ()
 {
-   int nbp = el_parent.size();
+   int  nbp   = el_parent.size();
    bool prems = true;
 
-   if (nbp==0)
-      {
-      printf ("\n");
-      }
-
    for (int nro=0 ; nro<nbp ; nro++)
        {
        if (el_parent[nro]->isHere ())
@@ -178,14 +173,14 @@ bool EltBase::debug (int niv)
    return el_root != NULL && el_root->getLevel() > niv ;
 }
 // ========================================================= getNextName
-string EltBase::getNextName ()
+std::string EltBase::getNextName ()
 {
    if (el_root != NULL)
       return el_root->getNextName (el_type);
 
    char name [16];
    makeName  (el_type, 0, name);
-   return string (name);
+   return std::string (name);
 }
 END_NAMESPACE_HEXA