Fix compilation errors (OCCT-7.4.0)

diff --git a/src/HEXABLOCK/HexAssoEdge.cxx b/src/HEXABLOCK/HexAssoEdge.cxx
index 0750cffde4bb8f01ac0305dd144255a66c20fe5c..096641ef4b5b48bf0a99011b42df51c0b7d1538b 100644 (file)
--- a/src/HEXABLOCK/HexAssoEdge.cxx
+++ b/src/HEXABLOCK/HexAssoEdge.cxx
@@ -123,8 +123,8 @@ void AssoEdge::setEnd (double param)
 // ========================================================= dump
 void AssoEdge::dump ()
 {
-   cout << " AssoEddge = " << arc_line->getName()
-        << " (" << arc_para1 << ", " << arc_para2 << ")" << endl;
+  std::cout << " AssoEddge = " << arc_line->getName()
+           << " (" << arc_para1 << ", " << arc_para2 << ")" << std::endl;
 
    PutCoord (arc_start);
    PutCoord (arc_end);

diff --git a/src/HEXABLOCK/HexBiCylinderShape.cxx b/src/HEXABLOCK/HexBiCylinderShape.cxx
index af47ec4c5ad55cdb49d6ebb6c809e0d44c924ae5..1a9fa57c2774b19f2af3947ac1f467ba71a58ff3 100644 (file)
--- a/src/HEXABLOCK/HexBiCylinderShape.cxx
+++ b/src/HEXABLOCK/HexBiCylinderShape.cxx
@@ -120,10 +120,10 @@ int BiCylinderShape::anaVertex (Vertex* node, int* tline, double* tpara)
        {
        EdgeShape* line  = bi_shape->getEdgeShape (nl);
        double     param = line->getParam (point);
-       if (db) cout << " ... getParam " << node->getName()
-                    << ", point=(" << point[0] << ", " << point[1]
-                    << ", " << point[2]
-                    << "), nl=" << nl << ", param=" << param << endl;
+       if (db) std::cout << " ... getParam " << node->getName()
+                        << ", point=(" << point[0] << ", " << point[1]
+                        << ", " << point[2]
+                        << "), nl=" << nl << ", param=" << param << std::endl;
        if (param>=0)
           {
           if (nbsol>=2)

diff --git a/src/HEXABLOCK/HexDocument.cxx b/src/HEXABLOCK/HexDocument.cxx
index 16e1ae67fd20767463b9c25b824747d7aad5a676..b7ce32e6e5cbd04108b25c5dbd1738f008e1f98c 100644 (file)
--- a/src/HEXABLOCK/HexDocument.cxx
+++ b/src/HEXABLOCK/HexDocument.cxx
@@ -726,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)
       {

diff --git a/src/HEXABLOCK/HexDocument_Xml.cxx b/src/HEXABLOCK/HexDocument_Xml.cxx
index 2339db3b9ff589a64f2b2b4ae5e2893e48d4dad1..6729bcafe6ee7fd11e9026dcdf42f52edf13184c 100644 (file)
--- a/src/HEXABLOCK/HexDocument_Xml.cxx
+++ b/src/HEXABLOCK/HexDocument_Xml.cxx
@@ -183,8 +183,8 @@ int Document::parseXml (XmlTree& xml)
    const  std::string& version = xml.findValue ("version");
    if (version == "")
        {
-       cout << " **** Format du fichier XML perime"
-            << endl;
+       std::cout << " **** Format du fichier XML perime"
+                << std::endl;
        return HERR;
        }
    const  std::string& name = xml.findValue ("name");
@@ -513,10 +513,10 @@ int Document::saveVtk0 (cpchar nomfic)
    pfile vtk = fopen (nomfic, "w");
    if (vtk==NULL)
       {
-      cout << " ****" << endl;
-      cout << " **** Document::saveVtk : " << endl;
-      cout << " **** Can't open file "     << endl;
-      cout << " ****" << endl;
+      std::cout << " ****" << std::endl;
+      std::cout << " **** Document::saveVtk : " << std::endl;
+      std::cout << " **** Can't open file "     << std::endl;
+      std::cout << " ****" << std::endl;
 
       }
    fprintf (vtk, "# vtk DataFile Version 3.1\n");
@@ -577,10 +577,10 @@ int Document::saveVtk (cpchar nomfic)
    pfile vtk = fopen (nomfic, "w");
    if (vtk==NULL)
       {
-      cout << " ****" << endl;
-      cout << " **** Document::saveVtk : " << endl;
-      cout << " **** Can't open file "     << endl;
-      cout << " ****" << endl;
+      std::cout << " ****" << std::endl;
+      std::cout << " **** Document::saveVtk : " << std::endl;
+      std::cout << " **** Can't open file "     << std::endl;
+      std::cout << " ****" << std::endl;
 
       }
    fprintf (vtk, "# vtk DataFile Version 3.1\n");

diff --git a/src/HEXABLOCK/HexDocument_asso.cxx b/src/HEXABLOCK/HexDocument_asso.cxx
index da5d19b78238ce0b9d680fa2318d1531d14cba5e..707f2fae544e94e03f52ed3169a0f609b350503a 100644 (file)
--- a/src/HEXABLOCK/HexDocument_asso.cxx
+++ b/src/HEXABLOCK/HexDocument_asso.cxx
@@ -218,10 +218,10 @@ int Document::associateOpenedLine (Edges  mline, NewShapes gline,
                                    IntVector tabid,
                                    double pstart, double pend)
 {
-   cout << "_________________________________ Asso Open Line"
-        << " ed=" << mline.size()
-        << " sh=" << tabid.size()
-        << endl;
+  std::cout << "_________________________________ Asso Open Line"
+           << " ed=" << mline.size()
+           << " sh=" << tabid.size()
+           << std::endl;
    int ier = associateLine (NULL, mline, gline, tabid, pstart, pend, false);
    return ier;
 }
@@ -236,12 +236,12 @@ int Document::associateClosedLine (Vertex* vfirst,   Edges  mline,
       return HERR;
       }
 
-   cout << "_________________________________ Asso Closed Line"
-        << " first=" << vfirst->getName()
-        << " ed=" << mline.size()
-        << " sh=" << tabid.size()
-        << " inv=" << inv
-        << endl;
+   std::cout << "_________________________________ Asso Closed Line"
+            << " first=" << vfirst->getName()
+            << " ed=" << mline.size()
+            << " sh=" << tabid.size()
+            << " inv=" << inv
+            << std::endl;
    int ier = associateLine (vfirst, mline, gline, tabid, pstart, 1.0, inv);
    PutData (ier);
    return ier;
@@ -528,8 +528,8 @@ int Document::checkAssociations ()
        if (ier != HOK) nberrors ++;
        }
 
-   cout << " ... Check edges assotiations : " << nberrors
-        << " error(s)." << endl;
+   std::cout << " ... Check edges assotiations : " << nberrors
+            << " error(s)." << std::endl;
 
    if (nberrors>0) return HERR;
       else         return HOK;

diff --git a/src/HEXABLOCK/HexEdge.cxx b/src/HEXABLOCK/HexEdge.cxx
index e3308cdfbf01157ee9f03ec4552feb65a87bca6d..c557b149384b0ff10d14d63995f95ff9d9cb1963 100644 (file)
--- a/src/HEXABLOCK/HexEdge.cxx
+++ b/src/HEXABLOCK/HexEdge.cxx
@@ -144,13 +144,13 @@ void Edge::setPropag  (int nro, bool sens)
    Vertex* v1 = getVertex (  prems);
    Vertex* v2 = getVertex (1-prems);
 
-   cout << " setPropag " << el_name
-           << " = "   << nro 
-           <<  " = (" << v1->getName() << ", "    << v2->getName()
-           << ") = (" << v2->getX() - v1->getX() 
-           << ", "    << v2->getY() - v1->getY() 
-           << ", "    << v2->getZ() - v1->getZ() 
-           << ")"     << endl;
+   std::cout << " setPropag " << el_name
+            << " = "   << nro 
+            <<  " = (" << v1->getName() << ", "    << v2->getName()
+            << ") = (" << v2->getX() - v1->getX() 
+            << ", "    << v2->getY() - v1->getY() 
+            << ", "    << v2->getZ() - v1->getZ() 
+            << ")"     << std::endl;
 }
 // ========================================================= getParent
 Quad* Edge::getParent  (int nro)
@@ -271,12 +271,12 @@ int Edge::addAssociation (EdgeShape* gline, double deb, double fin)
 
    if (db)
       {
-      cout << " Edge " << el_name
-           << " = (" << e_vertex[V_AMONT]->getName()
-           << " , "  << e_vertex[V_AVAL ]->getName()
-           << ") addAssociation " << gline->getName ()
-           << " (" << deb << ", " << fin << ")"
-           << endl;
+       std::cout << " Edge " << el_name
+                 << " = (" << e_vertex[V_AMONT]->getName()
+                 << " , "  << e_vertex[V_AVAL ]->getName()
+                 << ") addAssociation " << gline->getName ()
+                 << " (" << deb << ", " << fin << ")"
+                 << std::endl;
       PutCoord (asso->getOrigin ());
       PutCoord (asso->getExtrem ());
       }
@@ -289,8 +289,8 @@ int Edge::addAssociation (NewShape* geom, int subid, double deb, double fin)
    if (geom == NULL)
       {
       if (el_root->debug ())
-          cout << "  Edge " << el_name << " addAssociation of NULL ignored"
-               << endl;
+       std::cout << "  Edge " << el_name << " addAssociation of NULL ignored"
+                 << std::endl;
       return HERR;
       }
 
@@ -444,12 +444,12 @@ int Edge::checkAssociation ()
               {
               if (arc[nro] != NOTHING)
                  {
-                 if (ier==HOK) cout << endl;
-                 cout << " Association Edge "  << el_name
-                      << " : Le vertex " << e_vertex[nro]->getName()
-                      << " : Le vertex " << e_vertex[nro]->getName()
-                      << " Touche les lignes " << arc [nro]
-                      << " et " << nass << endl;
+                if (ier==HOK) std::cout << std::endl;
+                 std::cout << " Association Edge "  << el_name
+                          << " : Le vertex " << e_vertex[nro]->getName()
+                          << " : Le vertex " << e_vertex[nro]->getName()
+                          << " Touche les lignes " << arc [nro]
+                          << " et " << nass << std::endl;
                  ier   = 112;
                  }
               arc  [nro] = nass;
@@ -462,11 +462,11 @@ int Edge::checkAssociation ()
        {
        if (arc [nro] == NOTHING)
           {
-          if (ier==HOK) cout << endl;
-          cout << " Association Edge " << el_name
-               << " : Le vertex nro " << nro
-               << " = " << e_vertex[nro]->getName()
-               << " est isole" << endl;
+         if (ier==HOK) std::cout << std::endl;
+          std::cout << " Association Edge " << el_name
+                   << " : Le vertex nro " << nro
+                   << " = " << e_vertex[nro]->getName()
+                   << " est isole" << std::endl;
           PutCoord (ver_assoc[nro]);
           ier = 111;
           }
@@ -474,24 +474,24 @@ int Edge::checkAssociation ()
    if (ier==HOK)
        return ier;
 
-   cout << " ** Controle associations (" << nombre << ") edge " << el_name
-        << " = (" << e_vertex[V_AMONT]->getName()
-        << " , "  << e_vertex[V_AVAL ]->getName()
-        << ")" << endl;
+   std::cout << " ** Controle associations (" << nombre << ") edge " << el_name
+            << " = (" << e_vertex[V_AMONT]->getName()
+            << " , "  << e_vertex[V_AVAL ]->getName()
+            << ")" << std::endl;
 
    for (int nv=0 ; nv<2 ; ++nv)
        {
        Vertex* node = e_vertex[nv];
-       cout << node->getName()         << " = (" << node->getX()
-             << ", "   << node->getY() << ", "   << node->getZ()
-             << ") -> "<< ver_assoc [nv][0] << ", " << ver_assoc [nv][1]
-             << ", "   << ver_assoc [nv][2] << ")"  << endl;
+       std::cout << node->getName()         << " = (" << node->getX()
+                << ", "   << node->getY() << ", "   << node->getZ()
+                << ") -> "<< ver_assoc [nv][0] << ", " << ver_assoc [nv][1]
+                << ", "   << ver_assoc [nv][2] << ")"  << std::endl;
        }
 
    for (int nass=0 ; nass<nombre ; ++nass)
        {
        AssoEdge*  asso = tab_assoc[nass];
-       cout << " " << nass << " :";
+       std::cout << " " << nass << " :";
        asso->dump ();
        }
 
@@ -539,20 +539,20 @@ int Edge::findAssociation (NewShape* geom)
    EdgeShape*  gline = geom->findEdge (point, p2);
    if (gline==NULL)
       { 
-      cout << " *** FindAssociation "  << el_name << endl;
+      std::cout << " *** FindAssociation "  << el_name << std::endl;
       for (int nv=0 ; nv < V_TWO ; ++nv)
           {
           e_vertex [nv]-> getAssoCoord (point);
           VertexShape* shape = geom->findVertex (point);
-          cout << " *** Vertex nro "  << nv;
+          std::cout << " *** Vertex nro "  << nv;
           if (shape==NULL)
              {
-             cout << " absent : ";
+            std::cout << " absent : ";
              PutCoord (point);
              }
           else
              {
-             cout << " : Subid = " << shape->getIdent() << endl;
+              std::cout << " : Subid = " << shape->getIdent() << std::endl;
              }
           }
       return NOTHING;
@@ -568,8 +568,8 @@ int Edge::setAssociation (NewShape* geom, int subid)
    if (geom == NULL)
       {
       if (el_root->debug ())
-          cout << "  Edge " << el_name << " addAssociation of NULL ignored"
-               << endl;
+       std::cout << "  Edge " << el_name << " addAssociation of NULL ignored"
+                 << std::endl;
       return HERR;
       }
 
@@ -577,8 +577,8 @@ int Edge::setAssociation (NewShape* geom, int subid)
    if (gline == NULL)
       {
       if (el_root->debug ())
-          cout << "  Edge " << el_name << " addAssociation bad subid : "
-               << subid << endl;
+       std::cout << "  Edge " << el_name << " addAssociation bad subid : "
+                 << subid << std::endl;
       return HERR;
       }
 
@@ -592,7 +592,7 @@ int Edge::setAssociation (NewShape* geom, int subid)
    double db1 = calc_d2 (pb, p1);
    double db2 = calc_d2 (pb, p2);
    
-   cout << "setAssociation " << el_name << " :" <<endl;
+   std::cout << "setAssociation " << el_name << " :" <<std::endl;
 
    if (da2 < da1 && db1 < db2) 
       {

diff --git a/src/HEXABLOCK/HexElements_asso.cxx b/src/HEXABLOCK/HexElements_asso.cxx
index 45e39f0e15e4cb65243f737d16d29af822187c0d..c69f8958ca7710195c49c4e04f98aa146bd5c063 100644 (file)
--- a/src/HEXABLOCK/HexElements_asso.cxx
+++ b/src/HEXABLOCK/HexElements_asso.cxx
@@ -112,36 +112,36 @@ void Elements::cutAssociation (Edge* orig, Edges& tedges)
 // ====================================================== geom_dump_asso
 void geom_dump_asso (Edge* edge)
 {
-   cout << endl;
-   cout << " _______________________________________________________ "
-         << " dump_edge :" << endl;
+  std::cout << std::endl;
+  std::cout << " _______________________________________________________ "
+           << " dump_edge :" << std::endl;
 
    if (edge==NULL || NOT edge->isHere ())
       {
-      cout << "*** deleted ***" << endl;
+      std::cout << "*** deleted ***" << std::endl;
       return;
       }
 
-   cout << endl;
-   cout << " ... Edge = " << edge->getName ()
-        << " = (" << edge->getVertex(V_AMONT)->getName()
-        <<   ", " << edge->getVertex(V_AVAL )->getName() << ")" << endl;
+   std::cout << std::endl;
+   std::cout << " ... Edge = " << edge->getName ()
+            << " = (" << edge->getVertex(V_AMONT)->getName()
+            <<   ", " << edge->getVertex(V_AVAL )->getName() << ")" << std::endl;
 
    for (int nro=0 ; nro<V_TWO ; nro++)
        {
        Vertex* node  = edge->getVertex (nro);
-       cout << " ... " << node->getName()
+       std::cout << " ... " << node->getName()
             <<  " = (" << node->getX()
             <<    ", " << node->getY()
             <<    ", " << node->getZ() << ")";
 
        if (node->isAssociated())
-           cout << " --> (" << node->getAssoX()
-                <<     ", " << node->getAssoY()
-                <<     ", " << node->getAssoZ() << ")";
+        std::cout << " --> (" << node->getAssoX()
+                  <<     ", " << node->getAssoY()
+                  <<     ", " << node->getAssoZ() << ")";
        else
-           cout << " (not associated)";
-       cout << endl;
+        std::cout << " (not associated)";
+       std::cout << std::endl;
        }
 
    int nbr_associations = edge->countAssociation ();
@@ -150,7 +150,7 @@ void geom_dump_asso (Edge* edge)
    for (int nro=0 ; nro<nbr_associations ; nro++)
        {
        AssoEdge* asso = edge->getAssociation (nro);
-       cout << " *** Association nro " << nro+1 << endl;
+       std::cout << " *** Association nro " << nro+1 << std::endl;
        const double* shape_origin = asso->getOrigin();
        const double* shape_extrem = asso->getExtrem();
        PutData  (asso->getStart());
@@ -158,6 +158,6 @@ void geom_dump_asso (Edge* edge)
        PutCoord (shape_origin);
        PutCoord (shape_extrem);
        }
-   cout << endl << endl;
+   std::cout << std::endl << std::endl;
 }
 END_NAMESPACE_HEXA

diff --git a/src/HEXABLOCK/HexElements_ter.cxx b/src/HEXABLOCK/HexElements_ter.cxx
index 087bb18a6262702772f439c221caf2c3e6f342c1..4d5a4628b5188c8c7e30a531ea951d3fdd7b2899 100644 (file)
--- a/src/HEXABLOCK/HexElements_ter.cxx
+++ b/src/HEXABLOCK/HexElements_ter.cxx
@@ -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);

diff --git a/src/HEXABLOCK/HexNewShape.cxx b/src/HEXABLOCK/HexNewShape.cxx
index 56e1eb6e993097784665d33fe2c23cac4c364fff..f27852ba46584bffc5ee8151e826adb780daddc2 100644 (file)
--- a/src/HEXABLOCK/HexNewShape.cxx
+++ b/src/HEXABLOCK/HexNewShape.cxx
@@ -91,7 +91,7 @@ void NewShape::setShape (const TopoDS_Shape& shape, EnumShape type)
    sh_face_max = sh_edge_max = sh_vertex_max = 0;
 
    if (db)
-      cout <<  " ------------------- setShape " << el_name << endl;
+     std::cout <<  " ------------------- setShape " << el_name << std::endl;
    parseShape (geo_shape);
 }
 // ====================================================== setBrep
@@ -140,12 +140,12 @@ int NewShape::addCircle (double* milieu, double rayon, double* normale,
    geo_builder.Add (geo_compound, geom_circ);
 
    if (db)
-   cout << " .... AddCircle subid " << curr_subid << " : rayon=" << rayon
-        << " centre = " << milieu[dir_x] << "," << milieu[dir_y]
-        << "," << milieu[dir_z]
-        << " norm = " << normale[dir_x] << "," << normale[dir_y]
-        << "," << normale[dir_z]
-        << endl;
+   std::cout << " .... AddCircle subid " << curr_subid << " : rayon=" << rayon
+            << " centre = " << milieu[dir_x] << "," << milieu[dir_y]
+            << "," << milieu[dir_z]
+            << " norm = " << normale[dir_x] << "," << normale[dir_y]
+            << "," << normale[dir_z]
+            << std::endl;
 
    int  subid  = curr_subid;
    curr_subid += 2;
@@ -163,9 +163,9 @@ int NewShape::addSphere (double* milieu, double radius)
    geo_builder.Add (geo_compound, geom_sphere);
 
    if (db)
-   cout << " .... AddSphere subid " << curr_subid << " : rayon=" << radius
-        << " centre = " << milieu[dir_x] << "," << milieu[dir_y]
-        << "," << milieu[dir_z] << endl;
+     std::cout << " .... AddSphere subid " << curr_subid << " : rayon=" << radius
+              << " centre = " << milieu[dir_x] << "," << milieu[dir_y]
+              << "," << milieu[dir_z] << std::endl;
 
    int  subid  = curr_subid;
    curr_subid += 7;
@@ -224,11 +224,11 @@ void NewShape::addAssociation (Edge* edge, int subid, double pmin, double pmax)
 
    if (db0) 
       {
-      cout << edge->getName() 
-           << " = (" << edge->getVertex(0)->getName() 
-           << ", "   << edge->getVertex(1)->getName() 
-           << ") --> subid= " << subid << " [ " 
-           << pmin << ", " << pmax << "]" << endl;
+      std::cout << edge->getName() 
+               << " = (" << edge->getVertex(0)->getName() 
+               << ", "   << edge->getVertex(1)->getName() 
+               << ") --> subid= " << subid << " [ " 
+               << pmin << ", " << pmax << "]" << std::endl;
       }
 
    asso_edge.push_back (edge);
@@ -251,7 +251,7 @@ void NewShape::closeShape ()
    geo_shape     = geo_compound;
    shape_defined = true;
    if (db)
-   cout <<  " ------------------- closeShape " << el_name << endl;
+   std::cout <<  " ------------------- closeShape " << el_name << std::endl;
    parseShape (geo_shape);
 
    int nombre = asso_edge.size ();
@@ -567,20 +567,20 @@ void NewShape::addSubShape (const TopoDS_Shape& shape)
    if (db0)
       {
       sprintf (chnum, "%4d : ", sh_indice);
-      cout <<  chnum;
-      for (int nro=1; nro<sh_level; nro++) cout << " | ";
-      cout <<  name;
+      std::cout <<  chnum;
+      for (int nro=1; nro<sh_level; nro++) std::cout << " | ";
+      std::cout <<  name;
 
       if (type == TopAbs_VERTEX)
          {
          TopoDS_Vertex gver = TopoDS::Vertex (shape);
          gp_Pnt      gpoint = BRep_Tool::Pnt (gver);
 
-         cout << " = (" << gpoint.X()
-              << ","    << gpoint.Y()
-              << ","    << gpoint.Z() << ")";
+         std::cout << " = (" << gpoint.X()
+                  << ","    << gpoint.Y()
+                  << ","    << gpoint.Z() << ")";
          }
-      cout << endl;
+      std::cout << std::endl;
       }
 }
 // ===================================================== updateShape
@@ -594,7 +594,7 @@ int NewShape::updateShape ()
 
    shape_defined = true;
    geom_brep2shape (geo_brep, geo_shape);
-   cout <<  " ------------------- updateShape " << el_name << endl;
+   std::cout <<  " ------------------- updateShape " << el_name << std::endl;
    parseShape (geo_shape);
    return HOK;
 }

diff --git a/src/HEXABLOCK/HexQuad.cxx b/src/HEXABLOCK/HexQuad.cxx
index 048bcc09b36cce78d1d8094e8198c3c53d8bdd23..7673e5af8c2becfec02bfdf0d0768a5af15989fe 100644 (file)
--- a/src/HEXABLOCK/HexQuad.cxx
+++ b/src/HEXABLOCK/HexQuad.cxx
@@ -343,8 +343,8 @@ int Quad::coupler (Quad* other, StrOrient* orient, Elements* table)
       return HERR;
    if (db)
       {
-      cout << " Quads::coupler " << el_name << " -> " << other->getName () 
-           << endl;
+      std::cout << " Quads::coupler " << el_name << " -> " << other->getName () 
+               << std::endl;
       }
 
    Hexa* hexa = other->getParent(0);
@@ -452,7 +452,7 @@ Edge* Quad::getOpposEdge (Edge* start, int& sens)
            }
        }
    //             TODO : traiter l'erreur
-   cout << " ... Probleme dans Quad::getOpposedEdge :" << endl;
+   std::cout << " ... Probleme dans Quad::getOpposedEdge :" << std::endl;
    HexDisplay (el_name);
    PutName (start);
    PutName (vaprim);

diff --git a/src/HEXABLOCK/HexVertex.cxx b/src/HEXABLOCK/HexVertex.cxx
index 5343c458d632c1d739c18d038d15bbeed7d377ba..9e02d2aea35c2f4c44211be4427a4039e0951f0b 100644 (file)
--- a/src/HEXABLOCK/HexVertex.cxx
+++ b/src/HEXABLOCK/HexVertex.cxx
@@ -133,9 +133,9 @@ int Vertex::setAssociation (VertexShape* forme)
    forme->getCoords (gc_x, gc_y, gc_z);
    v_shape = forme;
 
-   if (db) cout << " Vertex "           << el_name
-                << " setAssociation-> " << forme->getName ()
-                << " = (" << gc_x << ", " << gc_y << ", " << gc_z << ") \n" ;
+   if (db) std::cout << " Vertex "           << el_name
+                    << " setAssociation-> " << forme->getName ()
+                    << " = (" << gc_x << ", " << gc_y << ", " << gc_z << ") \n" ;
 
    is_associated = true;
    return HOK;