[CEA 13302] Policy for c++ files ? using namespaces in c++ header files. boost_ptr...

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

diff --git a/src/HEXABLOCK/HexDumpStudy.cxx b/src/HEXABLOCK/HexDumpStudy.cxx
old mode 100755 (executable)
new mode 100644 (file)
index d0093d5..1d384d2
--- a/src/HEXABLOCK/HexDumpStudy.cxx
+++ b/src/HEXABLOCK/HexDumpStudy.cxx
@@ -1,12 +1,12 @@
 
 // C++ : Dump python
 
-// Copyright (C) 2009-2013  CEA/DEN, EDF R&D
+// Copyright (C) 2009-2019  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
@@ -49,7 +49,7 @@ DumpStudy::DumpStudy ()
    if (fic_dump==NULL)
        fic_dump = stdout;
 
-   string buff;
+   std::string buff;
    cpchar when = get_time (buff);
 
    fprintf (fic_dump, "\n");
@@ -90,7 +90,7 @@ bool DumpStudy::start (cpchar obj, cpchar method, bool raz)
 // =================================================== operator << (int)
 DumpStudy& DumpStudy::operator << (int val)
 {
-   if (not is_open)
+   if (NOT is_open)
       return *this; 
 
    char     valeur [20];
@@ -102,7 +102,7 @@ DumpStudy& DumpStudy::operator << (int val)
 // =================================================== operator << (double)
 DumpStudy& DumpStudy::operator << (double val)
 {
-   if (not is_open)
+   if (NOT is_open)
       return *this; 
 
    char valeur [20];
@@ -114,10 +114,10 @@ DumpStudy& DumpStudy::operator << (double val)
 // =================================================== operator << (cpchar)
 DumpStudy& DumpStudy::operator << (cpchar val)
 {
-   if (not is_open)
+   if (NOT is_open)
       return *this; 
 
-   string valeur ("'");
+   std::string valeur ("'");
    valeur += val;
    valeur += "'";
 
@@ -127,7 +127,7 @@ DumpStudy& DumpStudy::operator << (cpchar val)
 // =================================================== operator << (elt)
 DumpStudy& DumpStudy::operator << (EltBase* elt)
 {
-   if (not is_open)
+   if (NOT is_open)
       return *this; 
 
    cpchar name = findName (elt);
@@ -137,7 +137,7 @@ DumpStudy& DumpStudy::operator << (EltBase* elt)
 // =================================================== operator << (Quads)
 DumpStudy& DumpStudy::operator << (Quads& tab)
 {
-   if (not is_open)
+   if (NOT is_open)
       return *this; 
 
    TabElts&  tabelt = (TabElts&) tab;
@@ -147,7 +147,7 @@ DumpStudy& DumpStudy::operator << (Quads& tab)
 // =================================================== operator << (Edges)
 DumpStudy& DumpStudy::operator << (Edges& tab)
 {
-   if (not is_open)
+   if (NOT is_open)
       return *this; 
 
    TabElts&  tabelt = (TabElts&) tab;
@@ -157,7 +157,7 @@ DumpStudy& DumpStudy::operator << (Edges& tab)
 // =================================================== operator << (Hexas)
 DumpStudy& DumpStudy::operator << (Hexas& tab)
 {
-   if (not is_open)
+   if (NOT is_open)
       return *this; 
 
    TabElts&  tabelt = (TabElts&) tab;
@@ -167,7 +167,7 @@ DumpStudy& DumpStudy::operator << (Hexas& tab)
 // =================================================== operator << (Reals)
 DumpStudy& DumpStudy::operator << (RealVector& tab)
 {
-   if (not is_open)
+   if (NOT is_open)
       return *this; 
 
    char name [20], valeur [30];
@@ -270,7 +270,7 @@ void DumpStudy::restore (bool reactive)
       is_open = false;
 }
 // =================================================== getBegin 
-void DumpStudy::getBegin (string& begin)
+void DumpStudy::getBegin (std::string& begin)
 {
    begin  = right_part;
    begin += ")";
@@ -351,7 +351,7 @@ void DumpStudy::closeVector ()
 cpchar DumpStudy::findName (EltBase* elt)
 {
    cpchar name = "Unknown";
-   map <EltBase*, string> :: iterator iter = map_name.find (elt);
+   std::map <EltBase*, std::string> :: iterator iter = map_name.find (elt);
    if (iter != map_name.end())
       name = iter->second.c_str();
    else