X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHEXABLOCK%2FHexElements_ter.cxx;h=4d5a4628b5188c8c7e30a531ea951d3fdd7b2899;hb=8b7cfb4df1df6612a5bd2a9afcb019609148cadf;hp=3b4a17b26ba30c4e85ea8cb2a0b1278989eaca14;hpb=79915240d6a80781f71c39224a469ed6e38b81cb;p=modules%2Fhexablock.git

diff --git a/src/HEXABLOCK/HexElements_ter.cxx b/src/HEXABLOCK/HexElements_ter.cxx
old mode 100755
new mode 100644
index 3b4a17b..4d5a462
--- a/src/HEXABLOCK/HexElements_ter.cxx
+++ b/src/HEXABLOCK/HexElements_ter.cxx
@@ -1,6 +1,6 @@
 // C++ : Table d'hexaedres (Evol Versions 3)
 
-// Copyright (C) 2009-2016  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
@@ -171,7 +171,7 @@ void Elements::assoCylinders (double* ori, double* vk, double angle,
    NewShape* geom = el_root->addShape (name, SH_CYLINDER);
    geom -> openShape();
 
-   string brep;
+   std::string brep;
    // Real3 vk = { normal->getDx(), normal->getDy(), normal->getDz() };
    // normer_vecteur (vk);
 
@@ -203,9 +203,9 @@ void Elements::assoCylinders (double* ori, double* vk, double angle,
                double pmax = t_angles [ny+1]/360;
                Edge*  edge = getEdgeJ (nx, ny, nz);
                geom->addAssociation (edge, subid, pmin, pmax);
-               if (db) cout << " assoCylinders : ny= " << ny 
-                            << ", nz= " << nz << " param = (" 
-                            << pmin << ", " << pmax  << ")\n";
+               if (db) std::cout << " assoCylinders : ny= " << ny 
+				 << ", nz= " << nz << " param = (" 
+				 << pmin << ", " << pmax  << ")\n";
                }
            }
        }
@@ -269,8 +269,8 @@ void Elements::assoRind (double* ori, double* vi, int nx, NewShape* geom)
            Vertex* nd2 = edge->getVertex (V_AVAL);
            double pmin = calcul_param (ori, vi, nd1);
            double pmax = calcul_param (ori, vi, nd2);
-           cout << " assoRind : ny= " << ny << ", nz= " << nz 
-                << " param = (" << pmin << ", " << pmax  << ")\n";
+           std::cout << " assoRind : ny= " << ny << ", nz= " << nz 
+		     << " param = (" << pmin << ", " << pmax  << ")\n";
 
            geom->addAssociation (edge, subid, pmin, pmax);
            geom->addAssociation (quad, sphid);
@@ -283,7 +283,7 @@ void Elements::assoCircle (double* center, Edge* ed1, Edge* ed2, NewShape* geom)
 {
    Real3 oa,  ob, normal;
    Real3 pta, ptb, ptc, ptd;
-   string brep;
+   std::string brep;
 
 //  Les 2 edges dont les petits cotes d'un rectangle de rapport L/l=sqrt(2)
 //  Soit le cercle circonscrit a ce rectangle.
@@ -366,7 +366,7 @@ int Elements::propagateAssociation (Edge* orig, Edge* dest, Edge* dir)
    if (vo1==NULL || vd1==NULL)
       return HERR;
 
-   string  trep;
+   std::string  trep;
    Real3   pa, pb, vdir1, vdir2;
    calc_vecteur (vo1->getPoint (pa), vd1->getPoint (pb), vdir1);
    calc_vecteur (vo2->getPoint (pa), vd2->getPoint (pb), vdir2);
@@ -381,7 +381,7 @@ int Elements::propagateAssociation (Edge* orig, Edge* dest, Edge* dir)
           Shape* shape  = tab_shapes[nro];
           if (shape!=NULL)
              {
-             string brep   = shape->getBrep();
+             std::string brep   = shape->getBrep();
              translate_brep (brep, vdir1, trep);
              // Shape* tshape = new Shape (trep);
              // tshape->setBounds (shape->getStart(), shape->getEnd());
@@ -396,7 +396,7 @@ int Elements::propagateAssociation (Edge* orig, Edge* dest, Edge* dir)
        Shape* shape = vo1->getAssociation ();
        if (shape!=NULL && vd1->getAssociation ()==NULL)
           {
-          string brep   = shape->getBrep();
+          std::string brep   = shape->getBrep();
           translate_brep (brep, vdir, trep);
           // Shape* tshape = new Shape (trep);
           // vd1->setAssociation (tshape);
@@ -430,7 +430,7 @@ int Elements::prismAssociation (Edge* lorig, Edge* ldest, int nh)
        char       name [24];
 
        sprintf (name, "0x%lx#%d", (unsigned long) shape, nh);
-       map<string,int>::iterator iter = map_shape.find (name);
+       std::map<std::string,int>::iterator iter = map_shape.find (name);
        if (iter != map_shape.end())
           subid = iter->second;
        else
@@ -660,7 +660,7 @@ int Elements::saveVtk  (cpchar radical, int &nro)
    sprintf (num, "%d", nro);
    nro ++;
 
-   string filename = radical;
+   std::string filename = radical;
    filename += num;
    filename += ".vtk";
    int ier = saveVtk (filename.c_str());