X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHEXABLOCK%2FHexDocument.cxx;h=b7ce32e6e5cbd04108b25c5dbd1738f008e1f98c;hb=76a04c833d6dbc5affe2455f372fb625050f5746;hp=5a1e00c97fb0ef7b941bba909d6e92693af5ad99;hpb=ab53385205fe062af0e87d4e14296b1492fe3611;p=modules%2Fhexablock.git

diff --git a/src/HEXABLOCK/HexDocument.cxx b/src/HEXABLOCK/HexDocument.cxx
old mode 100755
new mode 100644
index 5a1e00c..b7ce32e
--- a/src/HEXABLOCK/HexDocument.cxx
+++ b/src/HEXABLOCK/HexDocument.cxx
@@ -1,24 +1,24 @@
 
 // C++ : La clase principale de Hexa
 
-//  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.
+// 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, 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
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// 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
 
 #include "HexDocument.hxx"
 
@@ -29,7 +29,6 @@
 #include "HexHexa.hxx"
 
 #include "HexElements.hxx"
-#include "HexCrossElements.hxx"
 
 #include "HexVector.hxx"
 #include "HexMatrix.hxx"
@@ -677,13 +676,13 @@ int Document::mergeVertices (Vertex* vpar, Vertex* vold)
       return ier;
       }
 
-   map <Quad*,   Quad*>   rep_quad;
-   map <Edge*,   Edge*>   rep_edge;
-   map <Vertex*, Vertex*> rep_vertex;
+   std::map <Quad*,   Quad*>   rep_quad;
+   std::map <Edge*,   Edge*>   rep_edge;
+   std::map <Vertex*, Vertex*> rep_vertex;
 
-   map <Quad*,   Quad*>   :: iterator itq;
-   map <Edge*,   Edge*>   :: iterator ited;
-   map <Vertex*, Vertex*> :: iterator itv;
+   std::map <Quad*,   Quad*>   :: iterator itq;
+   std::map <Edge*,   Edge*>   :: iterator ited;
+   std::map <Vertex*, Vertex*> :: iterator itv;
    
    rep_vertex [vold] = vpar;
    int nbparv  = vold->getNbrParents ();
@@ -727,9 +726,9 @@ int Document::mergeVertices (Vertex* vpar, Vertex* vold)
            }
        }
 
-   cout << " +++ Intersection : veq = "   << rep_vertex.size() 
-        << " " << rep_edge.size() <<  " " << rep_quad.size()
-        << endl;
+   std::cout << " +++ Intersection : veq = "   << rep_vertex.size() 
+	     << " " << rep_edge.size() <<  " " << rep_quad.size()
+	     << std::endl;
 
    for (itq=rep_quad.begin(); itq!=rep_quad.end() ; ++itq)
       {
@@ -876,7 +875,7 @@ Law* Document::findLaw (const char* name)
 {
    DumpStart ("findLaw", name);
 
-   string nom = name;
+   std::string nom = name;
    Law*   loi = NULL;
 
    for (int nro=0 ;loi==NULL &&  nro<nbr_laws; nro++)
@@ -1069,7 +1068,7 @@ int Document::setName (cpchar prefix)
        ier = HERR;
    else
        {
-       string name = prefix;
+       std::string name = prefix;
        if (hex_parent != NULL)
            hex_parent->makeName (prefix, name);
        el_name = name;
@@ -1121,12 +1120,11 @@ char* Document::makeVarName (char* name)
 // ======================================================== isEmpty
 bool Document::isEmpty ()
 {
-   int nombre = countVertex () + countVector ()
-                               + countCylinder() + countPipe();
+   int nombre = countVertex () + countVector ();
    return nombre <= 0 && countLaw  () <= 1;
 }
 // ======================================================== getNextName
-cpchar Document::getNextName (EnumElt type, string& buff)
+cpchar Document::getNextName (EnumElt type, std::string& buff)
 {
    char name [8];
    EltBase::makeName (type, doc_nbr_elt [type], name);
@@ -1136,12 +1134,12 @@ cpchar Document::getNextName (EnumElt type, string& buff)
 }
 
 // ======================================================== getNextName
-string Document::getNextName (EnumElt type)
+std::string Document::getNextName (EnumElt type)
 {
    char name [8];
    EltBase::makeName (type, doc_nbr_elt [type], name);
 
-   return string(name);
+   return std::string(name);
 }
 
 // ======================================================== lockDump