From 3f0da1343da624b30d102d2354447614e82ebad8 Mon Sep 17 00:00:00 2001 From: rnv Date: Tue, 17 Dec 2019 22:20:53 +0300 Subject: [PATCH] Fix compilation errors (OCCT-7.4.0) --- src/HEXABLOCK/HexAssoEdge.cxx | 4 +- src/HEXABLOCK/HexBiCylinderShape.cxx | 8 +-- src/HEXABLOCK/HexDocument.cxx | 6 +- src/HEXABLOCK/HexDocument_Xml.cxx | 20 +++---- src/HEXABLOCK/HexDocument_asso.cxx | 24 ++++---- src/HEXABLOCK/HexEdge.cxx | 88 ++++++++++++++-------------- src/HEXABLOCK/HexElements_asso.cxx | 32 +++++----- src/HEXABLOCK/HexElements_ter.cxx | 10 ++-- src/HEXABLOCK/HexNewShape.cxx | 48 +++++++-------- src/HEXABLOCK/HexQuad.cxx | 6 +- src/HEXABLOCK/HexVertex.cxx | 6 +- 11 files changed, 126 insertions(+), 126 deletions(-) diff --git a/src/HEXABLOCK/HexAssoEdge.cxx b/src/HEXABLOCK/HexAssoEdge.cxx index 0750cff..096641e 100644 --- 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 af47ec4..1a9fa57 100644 --- 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 16e1ae6..b7ce32e 100644 --- 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 2339db3..6729bca 100644 --- 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 da5d19b..707f2fa 100644 --- 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 e3308cd..c557b14 100644 --- 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 ; nassdump (); } @@ -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 << " :" <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 ; nrogetVertex (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 ; nrogetAssociation (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 087bb18..4d5a462 100644 --- 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 56e1eb6..f27852b 100644 --- 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 " << 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 5343c45..9e02d2a 100644 --- 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; -- 2.39.2