OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00
Code Activity

0030895: Coding Rules - specify std namespace explicitly for std::cout and streams

Browse Source 
"endl" manipulator for Message_Messenger is renamed to "Message_EndLine".

The following entities from std namespace are now used
with std:: explicitly specified (from Standard_Stream.hxx):
std::istream,std::ostream,std::ofstream,std::ifstream,std::fstream,
std::filebuf,std::streambuf,std::streampos,std::ios,std::cout,std::cerr,
std::cin,std::endl,std::ends,std::flush,std::setw,std::setprecision,
std::hex,std::dec.
This commit is contained in:
tiv
2019-08-02 10:32:16 +03:00
committed by bugmaster
parent 3977d18aca
commit 0423218095
972 changed files with 8554 additions and 8550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/BRepOffset/BRepOffset_Analyse.cxx
View File

@@ -190,7 +190,7 @@ void BRepOffset_Analyse::Perform (const TopoDS_Shape& S,
}
else {
#ifdef OCCT_DEBUG
cout <<"edge shared by more than two faces"<<endl;
std::cout <<"edge shared by more than two faces"<<std::endl;
#endif
}
}
@@ -577,7 +577,7 @@ BRepOffset_Type DefineConnectType(const TopoDS_Edge& E,
else {
//Mixed not finished!
#ifdef OCCT_DEBUG
cout <<" faces locally mixed"<<endl;
std::cout <<" faces locally mixed"<<std::endl;
#endif
return BRepOffset_Convex;
}

54
src/BRepOffset/BRepOffset_Inter2d.cxx
View File

@@ -347,7 +347,7 @@ static void EdgeInter(const TopoDS_Face& F,
if (Precision::IsInfinite(aT1) || Precision::IsInfinite(aT2))
{
#ifdef OCCT_DEBUG
cout << "Inter2d : Solution rejected due to infinite parameter"<<endl;
std::cout << "Inter2d : Solution rejected due to infinite parameter"<<std::endl;
#endif
continue;
}
@@ -370,22 +370,22 @@ static void EdgeInter(const TopoDS_Face& F,
#ifdef OCCT_DEBUG
if (aT1 < f[1]-Tol || aT1 > l[1]+Tol)
{
cout << "out of limit"<<endl;
cout<<"aT1 = "<<aT1<<", f[1] = "<<f[1]<<", l[1] = "<<l[1]<<endl;
std::cout << "out of limit"<<std::endl;
std::cout<<"aT1 = "<<aT1<<", f[1] = "<<f[1]<<", l[1] = "<<l[1]<<std::endl;
}
if (aT2 < f[2]-Tol || aT2 > l[2]+Tol)
{
cout << "out of limit"<<endl;
cout<<"aT2 = "<<aT2<<", f[2] = "<<f[2]<<", l[2] = "<<l[2]<<endl;
std::cout << "out of limit"<<std::endl;
std::cout<<"aT2 = "<<aT2<<", f[2] = "<<f[2]<<", l[2] = "<<l[2]<<std::endl;
}
Standard_Real MilTol2 = 1000*Tol*Tol;
if (P1.SquareDistance(P) > MilTol2 || P2.SquareDistance(P) > MilTol2 || P1.Distance(P2) > 2.*Tol)
{
cout << "Inter2d : Solution rejected "<<endl;
cout<<"P = "<<P.X()<<" "<<P.Y()<<" "<<P.Z()<<endl;
cout<<"P1 = "<<P1.X()<<" "<<P1.Y()<<" "<<P1.Z()<<endl;
cout<<"P2 = "<<P2.X()<<" "<<P2.Y()<<" "<<P2.Z()<<endl;
cout<<"MaxDist = "<<dist1<<endl;
std::cout << "Inter2d : Solution rejected "<<std::endl;
std::cout<<"P = "<<P.X()<<" "<<P.Y()<<" "<<P.Z()<<std::endl;
std::cout<<"P1 = "<<P1.X()<<" "<<P1.Y()<<" "<<P1.Z()<<std::endl;
std::cout<<"P2 = "<<P2.X()<<" "<<P2.Y()<<" "<<P2.Z()<<std::endl;
std::cout<<"MaxDist = "<<dist1<<std::endl;
}
#endif
//define the orientation of a new vertex
@@ -405,7 +405,7 @@ static void EdgeInter(const TopoDS_Face& F,
Standard_Real CrossProd = V2or ^ V1;
#ifdef OCCT_DEBUG
if (Abs(CrossProd) <= gp::Resolution())
cout<<endl<<"CrossProd = "<<CrossProd<<endl;
std::cout<<std::endl<<"CrossProd = "<<CrossProd<<std::endl;
#endif
if (CrossProd > 0.)
OO1 = TopAbs_FORWARD;
@@ -489,7 +489,7 @@ static void EdgeInter(const TopoDS_Face& F,
// Modified by skv - Thu Jan 22 18:19:05 2004 OCC4455 End
LV1.Remove(it1LV1);
LV2.Remove(it1LV2);
if (AffichPurge) cout <<"Doubles removed in EdgeInter."<<endl;
if (AffichPurge) std::cout <<"Doubles removed in EdgeInter."<<std::endl;
Purge = Standard_True;
break;
}
@@ -616,7 +616,7 @@ static void RefEdgeInter(const TopoDS_Face& F,
if (Precision::IsInfinite(aT1) || Precision::IsInfinite(aT2))
{
#ifdef OCCT_DEBUG
cout << "Inter2d : Solution rejected due to infinite parameter"<<endl;
std::cout << "Inter2d : Solution rejected due to infinite parameter"<<std::endl;
#endif
continue;
}
@@ -639,22 +639,22 @@ static void RefEdgeInter(const TopoDS_Face& F,
#ifdef OCCT_DEBUG
if (aT1 < f[1]-Tol || aT1 > l[1]+Tol)
{
cout << "out of limit"<<endl;
cout<<"aT1 = "<<aT1<<", f[1] = "<<f[1]<<", l[1] = "<<l[1]<<endl;
std::cout << "out of limit"<<std::endl;
std::cout<<"aT1 = "<<aT1<<", f[1] = "<<f[1]<<", l[1] = "<<l[1]<<std::endl;
}
if (aT2 < f[2]-Tol || aT2 > l[2]+Tol)
{
cout << "out of limit"<<endl;
cout<<"aT2 = "<<aT2<<", f[2] = "<<f[2]<<", l[2] = "<<l[2]<<endl;
std::cout << "out of limit"<<std::endl;
std::cout<<"aT2 = "<<aT2<<", f[2] = "<<f[2]<<", l[2] = "<<l[2]<<std::endl;
}
Standard_Real MilTol2 = 1000*Tol*Tol;
if (P1.SquareDistance(P) > MilTol2 || P2.SquareDistance(P) > MilTol2 || P1.Distance(P2) > 2.*Tol)
{
cout << "Inter2d : Solution rejected"<<endl;
cout<<"P = "<<P.X()<<" "<<P.Y()<<" "<<P.Z()<<endl;
cout<<"P1 = "<<P1.X()<<" "<<P1.Y()<<" "<<P1.Z()<<endl;
cout<<"P2 = "<<P2.X()<<" "<<P2.Y()<<" "<<P2.Z()<<endl;
cout<<"MaxDist = "<<dist1<<endl;
std::cout << "Inter2d : Solution rejected"<<std::endl;
std::cout<<"P = "<<P.X()<<" "<<P.Y()<<" "<<P.Z()<<std::endl;
std::cout<<"P1 = "<<P1.X()<<" "<<P1.Y()<<" "<<P1.Z()<<std::endl;
std::cout<<"P2 = "<<P2.X()<<" "<<P2.Y()<<" "<<P2.Z()<<std::endl;
std::cout<<"MaxDist = "<<dist1<<std::endl;
}
#endif
//define the orientation of a new vertex
@@ -674,7 +674,7 @@ static void RefEdgeInter(const TopoDS_Face& F,
Standard_Real CrossProd = V2or ^ V1;
#ifdef OCCT_DEBUG
if (Abs(CrossProd) <= gp::Resolution())
cout<<endl<<"CrossProd = "<<CrossProd<<endl;
std::cout<<std::endl<<"CrossProd = "<<CrossProd<<std::endl;
#endif
if (CrossProd > 0.)
OO1 = TopAbs_FORWARD;
@@ -746,7 +746,7 @@ static void RefEdgeInter(const TopoDS_Face& F,
if (P1.IsEqual(P2,10*Tol)) {
LV1.Remove(it1LV1);
LV2.Remove(it1LV2);
if (AffichPurge) cout <<"Doubles removed in EdgeInter."<<endl;
if (AffichPurge) std::cout <<"Doubles removed in EdgeInter."<<std::endl;
Purge = Standard_True;
break;
}
@@ -762,7 +762,7 @@ static void RefEdgeInter(const TopoDS_Face& F,
//---------------------------------
////-----------------------------------------------------
if(LV1.Extent() > 1) {
//cout << "IFV - RefEdgeInter: remove vertex" << endl;
//std::cout << "IFV - RefEdgeInter: remove vertex" << std::endl;
Standard_Real dmin = RealLast();
TopoDS_Vertex Vmin;
for (it1LV1.Initialize(LV1); it1LV1.More(); it1LV1.Next()) {
@@ -1135,7 +1135,7 @@ void BRepOffset_Inter2d::ExtentEdge(const TopoDS_Edge& E,TopoDS_Edge& NE, const
f = Projector.LowerDistanceParameter();
#ifdef OCCT_DEBUG
else
cout<<"ProjectPointOnCurve not done"<<endl;
std::cout<<"ProjectPointOnCurve not done"<<std::endl;
#endif
}
if (!Precision::IsInfinite(LastParOnPC))
@@ -1148,7 +1148,7 @@ void BRepOffset_Inter2d::ExtentEdge(const TopoDS_Edge& E,TopoDS_Edge& NE, const
l = Projector.LowerDistanceParameter();
#ifdef OCCT_DEBUG
else
cout<<"ProjectPointOnCurve not done"<<endl;
std::cout<<"ProjectPointOnCurve not done"<<std::endl;
#endif
}
}

30
src/BRepOffset/BRepOffset_MakeOffset.cxx
View File

@@ -159,7 +159,7 @@ static void DEBVerticesControl (const TopTools_IndexedMapOfShape& NewEdges,
for (it1LE.Initialize(AsDes->Descendant(NE)); it1LE.More(); it1LE.Next()) {
if (AsDes->Ascendant(it1LE.Value()).Extent() < 3) {
LVP.Append(it1LE.Value());
cout <<"Vertex on at least 3 edges."<<endl;
std::cout <<"Vertex on at least 3 edges."<<std::endl;
#ifdef DRAW
if (AffichInt2d) {
sprintf (name,"VP_%d",NVP++);
@@ -168,7 +168,7 @@ static void DEBVerticesControl (const TopTools_IndexedMapOfShape& NewEdges,
#endif
}
else if (AsDes->Ascendant(it1LE.Value()).Extent() > 3) {
cout <<"Vertex on more than 3 edges."<<endl;
std::cout <<"Vertex on more than 3 edges."<<std::endl;
#ifdef DRAW
if (AffichInt2d) {
sprintf (name,"VM_%d",NVM++);
@@ -235,7 +235,7 @@ static void DEBVerticesControl (const TopTools_IndexedMapOfShape& NewEdges,
j++;
}
i++;
cout <<" distmin between VP : "<<distmin<<endl;
std::cout <<" distmin between VP : "<<distmin<<std::endl;
}
}
#endif
@@ -953,14 +953,14 @@ void BRepOffset_MakeOffset::MakeThickSolid()
#ifdef OCCT_DEBUG
if(YaResult == 0)
{
cout << "OffsetShape does not contain a FACES." << endl;
std::cout << "OffsetShape does not contain a FACES." << std::endl;
}
#endif
}
#ifdef OCCT_DEBUG
else
{
cout << "OffsetShape is null!" << endl;
std::cout << "OffsetShape is null!" << std::endl;
}
#endif
@@ -1089,7 +1089,7 @@ void BRepOffset_MakeOffset::BuildOffsetByInter()
{
#ifdef OCCT_DEBUG
if ( ChronBuild) {
cout << " CONSTRUCTION OF OFFSETS :" << endl;
std::cout << " CONSTRUCTION OF OFFSETS :" << std::endl;
Clock.Reset();
Clock.Start();
}
@@ -1445,7 +1445,7 @@ void BRepOffset_MakeOffset::BuildOffsetByArc()
{
#ifdef OCCT_DEBUG
if ( ChronBuild) {
cout << " CONSTRUCTION OF OFFSETS :" << endl;
std::cout << " CONSTRUCTION OF OFFSETS :" << std::endl;
Clock.Reset();
Clock.Start();
}
@@ -1654,7 +1654,7 @@ void BRepOffset_MakeOffset::SelfInter(TopTools_MapOfShape& /*Modif*/)
{
#ifdef OCCT_DEBUG
if ( ChronBuild) {
cout << " AUTODEBOUCLAGE:" << endl;
std::cout << " AUTODEBOUCLAGE:" << std::endl;
Clock.Reset();
Clock.Start();
}
@@ -2290,7 +2290,7 @@ void BRepOffset_MakeOffset::Intersection3D(BRepOffset_Inter3d& Inter)
{
#ifdef OCCT_DEBUG
if (ChronBuild) {
cout << " INTERSECTION 3D:" << endl;
std::cout << " INTERSECTION 3D:" << std::endl;
Clock.Reset();
Clock.Start();
}
@@ -2350,7 +2350,7 @@ void BRepOffset_MakeOffset::Intersection2D(const TopTools_IndexedMapOfShape& Mod
{
#ifdef OCCT_DEBUG
if (ChronBuild) {
cout << " INTERSECTION 2D:" << endl;
std::cout << " INTERSECTION 2D:" << std::endl;
Clock.Reset();
Clock.Start();
}
@@ -2390,7 +2390,7 @@ void BRepOffset_MakeOffset::MakeLoops(TopTools_IndexedMapOfShape& Modif)
{
#ifdef OCCT_DEBUG
if (ChronBuild) {
cout << " DEBOUCLAGE 2D:" << endl;
std::cout << " DEBOUCLAGE 2D:" << std::endl;
Clock.Reset();
Clock.Start();
}
@@ -2438,7 +2438,7 @@ void BRepOffset_MakeOffset::MakeFaces(TopTools_IndexedMapOfShape& /*Modif*/)
{
#ifdef OCCT_DEBUG
if (ChronBuild) {
cout << " RECONSTRUCTION OF FACES:" << endl;
std::cout << " RECONSTRUCTION OF FACES:" << std::endl;
Clock.Reset();
Clock.Start();
}
@@ -2946,7 +2946,7 @@ void BRepOffset_MakeOffset::MakeShells ()
{
#ifdef OCCT_DEBUG
if (ChronBuild) {
cout << " RECONSTRUCTION OF SHELLS:" << endl;
std::cout << " RECONSTRUCTION OF SHELLS:" << std::endl;
Clock.Reset();
Clock.Start();
}
@@ -3200,7 +3200,7 @@ void BRepOffset_MakeOffset::EncodeRegularity ()
{
#ifdef OCCT_DEBUG
if (ChronBuild) {
cout << " CODING OF REGULARITIES:" << endl;
std::cout << " CODING OF REGULARITIES:" << std::endl;
Clock.Reset();
Clock.Start();
}
@@ -3227,7 +3227,7 @@ void BRepOffset_MakeOffset::EncodeRegularity ()
if (LofOF.Extent() != 2) {
#ifdef OCCT_DEBUG_VERB
cout << " Edge shared by " << LofOF.Extent() << " Faces" << endl;
std::cout << " Edge shared by " << LofOF.Extent() << " Faces" << std::endl;
#endif
continue;
}

2
src/BRepOffset/BRepOffset_MakeOffset_1.cxx
View File

@@ -871,7 +871,7 @@ void BuildSplitsOfFaces(const TopTools_ListOfShape& theLF,
BRepAlgoAPI_Check aChecker(aCE);
if (!aChecker.IsValid())
{
cout << "Offset_i_c Error: set of edges to build faces is self-intersecting\n";
std::cout << "Offset_i_c Error: set of edges to build faces is self-intersecting\n";
}
#endif
// build splits

6
src/BRepOffset/BRepOffset_Offset.cxx
View File

@@ -941,7 +941,7 @@ void BRepOffset_Offset::Init(const TopoDS_Face& Face,
P2d = C2d->Value(l); TheSurf->D0(P2d.X(),P2d.Y(),P2);
Standard_Real Tol = BRep_Tool::Tolerance(V1);
if (!P1.IsEqual(P2,Tol)) {
cout <<"BRepOffset_Offset : E degenerated -> OE not degenerated"<<endl;
std::cout <<"BRepOffset_Offset : E degenerated -> OE not degenerated"<<std::endl;
}
#endif
*/
@@ -1241,7 +1241,7 @@ void BRepOffset_Offset::Init(const TopoDS_Edge& Path,
#ifdef OCCT_DEBUG
// si firstedge n est pas nul, il faut que les vertex soient partages
if ( !VVf.IsSame(V1f) && !VVf.IsSame(V2f) ) {
cout << "Attention Vertex non partages !!!!!!" << endl;
std::cout << "Attention Vertex non partages !!!!!!" << std::endl;
}
#endif
if ( !VVf.IsSame(V1f) && !VVf.IsSame(V2f) ) {
@@ -1305,7 +1305,7 @@ void BRepOffset_Offset::Init(const TopoDS_Edge& Path,
#ifdef OCCT_DEBUG
// si lastedge n est pas nul, il faut que les vertex soient partages
if ( !VVf.IsSame(V1l) && !VVf.IsSame(V2l) ) {
cout << "Attention Vertex non partages !!!!!!" << endl;
std::cout << "Attention Vertex non partages !!!!!!" << std::endl;
}
#endif
if ( !VVf.IsSame(V1l) && !VVf.IsSame(V2l) ) {

26
src/BRepOffset/BRepOffset_Tool.cxx
View File

@@ -1754,7 +1754,7 @@ void BRepOffset_Tool::Inter3D(const TopoDS_Face& F1,
BRepLib::SameParameter(anEdge, aSameParTol, Standard_True);
Standard_Real EdgeTol = BRep_Tool::Tolerance(anEdge);
#ifdef OCCT_DEBUG
cout<<"Tolerance of glued E = "<<EdgeTol<<endl;
std::cout<<"Tolerance of glued E = "<<EdgeTol<<std::endl;
#endif
if (EdgeTol > 1.e-2)
continue;
@@ -1764,7 +1764,7 @@ void BRepOffset_Tool::Inter3D(const TopoDS_Face& F1,
ReconstructPCurves(anEdge);
BRepLib::SameParameter(anEdge, aSameParTol, Standard_True);
#ifdef OCCT_DEBUG
cout<<"After projection tol of E = "<<BRep_Tool::Tolerance(anEdge)<<endl;
std::cout<<"After projection tol of E = "<<BRep_Tool::Tolerance(anEdge)<<std::endl;
#endif
}
@@ -2087,16 +2087,16 @@ static Standard_Boolean ProjectVertexOnEdge(TopoDS_Vertex& V,
if (AffichExtent) {
Standard_Real Dist = P.Distance(C.Value(U));
if (Dist > TolConf) {
cout << " ProjectVertexOnEdge :distance vertex edge :"<<Dist<<endl;
std::cout << " ProjectVertexOnEdge :distance vertex edge :"<<Dist<<std::endl;
}
if (U < f - Precision::Confusion() ||
U > l + Precision::Confusion()) {
cout << " ProjectVertexOnEdge : hors borne :"<<endl;
cout << " f = "<<f<<" l ="<<l<< " U ="<<U<<endl;
std::cout << " ProjectVertexOnEdge : hors borne :"<<std::endl;
std::cout << " f = "<<f<<" l ="<<l<< " U ="<<U<<std::endl;
}
}
if (!found) {
cout <<"BRepOffset_Tool::ProjectVertexOnEdge Parameter no found"<<endl;
std::cout <<"BRepOffset_Tool::ProjectVertexOnEdge Parameter no found"<<std::endl;
if (Abs(f) < Precision::Infinite() &&
Abs(l) < Precision::Infinite()) {
#ifdef DRAW
@@ -2187,7 +2187,7 @@ void BRepOffset_Tool::Inter2d (const TopoDS_Face& F,
// F,fl2[0],fl2[1]);
#ifdef OCCT_DEBUG
if (C1.IsNull() || C2.IsNull()) {
cout <<"Inter2d : Pas de pcurve"<<endl;
std::cout <<"Inter2d : Pas de pcurve"<<std::endl;
#ifdef DRAW
DBRep::Set("E1",E1);
DBRep::Set("E2",E2);
@@ -2304,11 +2304,11 @@ void BRepOffset_Tool::Inter2d (const TopoDS_Face& F,
Standard_Real U2on1 = IntP1.ParamOnSecond();
Standard_Real U2on2 = IntP2.ParamOnSecond();
#ifdef OCCT_DEBUG
cout << " BRepOffset_Tool::Inter2d SEGMENT d intersection" << endl;
cout << " ===> Parametres sur Curve1 : ";
cout << U1on1 << " " << U1on2 << endl;
cout << " ===> Parametres sur Curve2 : ";
cout << U2on1 << " " << U2on2 << endl;
std::cout << " BRepOffset_Tool::Inter2d SEGMENT d intersection" << std::endl;
std::cout << " ===> Parametres sur Curve1 : ";
std::cout << U1on1 << " " << U1on2 << std::endl;
std::cout << " ===> Parametres sur Curve2 : ";
std::cout << U2on1 << " " << U2on2 << std::endl;
#endif
U1 = (U1on1 + U1on2)/2.;
U2 = (U2on1 + U2on2)/2.;
@@ -2363,7 +2363,7 @@ void BRepOffset_Tool::Inter2d (const TopoDS_Face& F,
#ifdef OCCT_DEBUG
if (!YaSol) {
cout <<"Inter2d : Pas de solution"<<endl;
std::cout <<"Inter2d : Pas de solution"<<std::endl;
#ifdef DRAW
DBRep::Set("E1",E1);
DBRep::Set("E2",E2);