diff --git a/src/AdvApp2Var/AdvApp2Var_ApproxAFunc2Var.cxx b/src/AdvApp2Var/AdvApp2Var_ApproxAFunc2Var.cxx index f07a63a035..ed40686fa2 100644 --- a/src/AdvApp2Var/AdvApp2Var_ApproxAFunc2Var.cxx +++ b/src/AdvApp2Var/AdvApp2Var_ApproxAFunc2Var.cxx @@ -1065,44 +1065,44 @@ Standard_Real void AdvApp2Var_ApproxAFunc2Var::Dump(Standard_OStream& o) const { Standard_Integer iesp=1,NbKU,NbKV,ik; - o<Value(iesp)<Value(iesp)<<'\n'; } else if (my3DMaxError->Value(iesp)>my3DTolerances->Value(iesp)) { - o<<" WITHOUT the requested tolerance "<Value(iesp)<Value(iesp)<<'\n'; } else { - o<<" WITHOUT the requested continuities "<Value(iesp)<Value(iesp)<Value(iesp)<Value(iesp)<Value(iesp)<<'\n'; + o<<"Result average error :"<Value(iesp)<<'\n'; + o<<"Result max error on U frontiers :"<Value(iesp)<<'\n'; + o<<"Result max error on V frontiers :"<Value(iesp)<<'\n'; + o<<'\n'; o<<"Degree of Bezier patches in U : "<Value(iesp)); o<<"Number of poles in U : "<NbUPoles() - <<" in V : "<NbVPoles()<NbVPoles()<<'\n'; + o<<'\n'; NbKU = S->NbUKnots(); NbKV = S->NbVKnots(); - o<<"Number of knots in U : "<UKnot(ik)<<" mult : "<UMultiplicity(ik)<UKnot(ik)<<" mult : "<UMultiplicity(ik)<<'\n'; } - o<VKnot(ik)<<" mult : "<VMultiplicity(ik)<VKnot(ik)<<" mult : "<VMultiplicity(ik)<<'\n'; } - o< 0) { - o << "Error(s) 1d = " << std::endl; + o << "Error(s) 1d = " << '\n'; for (ii=1; ii <= myNumSubSpaces[0]; ii++) { - o << " " << MaxError(1, ii) << std::endl; + o << " " << MaxError(1, ii) << '\n'; } } if (myNumSubSpaces[1] > 0) { - o << "Error(s) 2d = " << std::endl; + o << "Error(s) 2d = " << '\n'; for (ii=1; ii <= myNumSubSpaces[1]; ii++) { - o << " " << MaxError(2, ii) << std::endl; + o << " " << MaxError(2, ii) << '\n'; } } if (myNumSubSpaces[2] > 0) { - o << "Error(s) 3d = " << std::endl; + o << "Error(s) 3d = " << '\n'; for (ii=1; ii <= myNumSubSpaces[2]; ii++) { - o << " " << MaxError(3, ii) << std::endl; + o << " " << MaxError(3, ii) << '\n'; } } } diff --git a/src/AdvApprox/AdvApprox_SimpleApprox.cxx b/src/AdvApprox/AdvApprox_SimpleApprox.cxx index 6ffcec798b..95c234ef30 100644 --- a/src/AdvApprox/AdvApprox_SimpleApprox.cxx +++ b/src/AdvApprox/AdvApprox_SimpleApprox.cxx @@ -378,9 +378,9 @@ Standard_Real AdvApprox_SimpleApprox::AverageError(const Standard_Integer Index) void AdvApprox_SimpleApprox::Dump(Standard_OStream& o) const { Standard_Integer ii; - o << "Dump of SimpleApprox " << std::endl; + o << "Dump of SimpleApprox " << '\n'; for (ii=1; ii <= myTotalNumSS; ii++) { - o << "Error " << MaxError(ii) << std::endl; + o << "Error " << MaxError(ii) << '\n'; } } diff --git a/src/AppDef/AppDef_MultiLine.cxx b/src/AppDef/AppDef_MultiLine.cxx index b53ea7db6d..7e324f172e 100644 --- a/src/AppDef/AppDef_MultiLine.cxx +++ b/src/AppDef/AppDef_MultiLine.cxx @@ -96,8 +96,8 @@ AppDef_MultiPointConstraint AppDef_MultiLine::Value (const Standard_Integer Inde void AppDef_MultiLine::Dump(Standard_OStream& o) const { - o << "AppDef_MultiLine dump:" << std::endl; + o << "AppDef_MultiLine dump:" << '\n'; // AppDef_MultiPointConstraint MP = tabMult->Value(1); - o << "It contains " << tabMult->Length() << " MultiPointConstraint"<< std::endl; + o << "It contains " << tabMult->Length() << " MultiPointConstraint"<< '\n'; // o << MP->NbPoints() << " 3d and " << MP->NbPoints2d() << std::endl; } diff --git a/src/AppDef/AppDef_MultiPointConstraint.cxx b/src/AppDef/AppDef_MultiPointConstraint.cxx index b35ba67def..3931abd300 100644 --- a/src/AppDef/AppDef_MultiPointConstraint.cxx +++ b/src/AppDef/AppDef_MultiPointConstraint.cxx @@ -316,5 +316,5 @@ Standard_Boolean AppDef_MultiPointConstraint::IsCurvaturePoint() const void AppDef_MultiPointConstraint::Dump(Standard_OStream& o) const { - o << "AppDef_MultiPointConstraint dump:" << std::endl; + o << "AppDef_MultiPointConstraint dump:" << '\n'; } diff --git a/src/AppDef/AppDef_Variational.cxx b/src/AppDef/AppDef_Variational.cxx index b4604d0e35..7d62f64fc7 100644 --- a/src/AppDef/AppDef_Variational.cxx +++ b/src/AppDef/AppDef_Variational.cxx @@ -878,34 +878,34 @@ Standard_Integer AppDef_Variational::NbIterations() const // void AppDef_Variational::Dump(Standard_OStream& o) const { - o << " \nVariational Smoothing " << std::endl; - o << " Number of multipoints " << myNbPoints << std::endl; - o << " Number of 2d par multipoint " << myNbP2d << std::endl; - o << " Nombre of 3d par multipoint " << myNbP3d << std::endl; - o << " Number of PassagePoint " << myNbPassPoints << std::endl; - o << " Number of TangencyPoints " << myNbTangPoints << std::endl; - o << " Number of CurvaturePoints " << myNbCurvPoints << std::endl; + o << " \nVariational Smoothing " << '\n'; + o << " Number of multipoints " << myNbPoints << '\n'; + o << " Number of 2d par multipoint " << myNbP2d << '\n'; + o << " Nombre of 3d par multipoint " << myNbP3d << '\n'; + o << " Number of PassagePoint " << myNbPassPoints << '\n'; + o << " Number of TangencyPoints " << myNbTangPoints << '\n'; + o << " Number of CurvaturePoints " << myNbCurvPoints << '\n'; o << " \nTolerance " << o.setf(std::ios::scientific) << std::setprecision(3) << std::setw(9) << myTolerance; - if ( WithMinMax()) { o << " as Max Error." << std::endl;} - else { o << " as size Error." << std::endl;} + if ( WithMinMax()) { o << " as Max Error." << '\n';} + else { o << " as size Error." << '\n';} o << "CriteriumWeights : " << myPercent[0] << " , " - << myPercent[1] << " , " << myPercent[2] << std::endl; + << myPercent[1] << " , " << myPercent[2] << '\n'; if (myIsDone ) { - o << " MaxError " << std::setprecision(3) << std::setw(9) << myMaxError << std::endl; - o << " Index of MaxError " << myMaxErrorIndex << std::endl; - o << " Average Error " << std::setprecision(3) << std::setw(9) << myAverageError << std::endl; - o << " Quadratic Error " << std::setprecision(3) << std::setw(9) << myCriterium[0] << std::endl; - o << " Tension Criterium " << std::setprecision(3) << std::setw(9) << myCriterium[1] << std::endl; - o << " Flexion Criterium " << std::setprecision(3) << std::setw(9) << myCriterium[2] << std::endl; - o << " Jerk Criterium " << std::setprecision(3) << std::setw(9) << myCriterium[3] << std::endl; - o << " NbSegments " << myKnots->Length()-1 << std::endl; + o << " MaxError " << std::setprecision(3) << std::setw(9) << myMaxError << '\n'; + o << " Index of MaxError " << myMaxErrorIndex << '\n'; + o << " Average Error " << std::setprecision(3) << std::setw(9) << myAverageError << '\n'; + o << " Quadratic Error " << std::setprecision(3) << std::setw(9) << myCriterium[0] << '\n'; + o << " Tension Criterium " << std::setprecision(3) << std::setw(9) << myCriterium[1] << '\n'; + o << " Flexion Criterium " << std::setprecision(3) << std::setw(9) << myCriterium[2] << '\n'; + o << " Jerk Criterium " << std::setprecision(3) << std::setw(9) << myCriterium[3] << '\n'; + o << " NbSegments " << myKnots->Length()-1 << '\n'; } else { o << (myIsOverConstr ? " The problem is overconstraint" - : " Error in approximation") << std::endl; + : " Error in approximation") << '\n'; } } diff --git a/src/AppParCurves/AppParCurves_MultiBSpCurve.cxx b/src/AppParCurves/AppParCurves_MultiBSpCurve.cxx index ed0a35993a..57fe27feb7 100644 --- a/src/AppParCurves/AppParCurves_MultiBSpCurve.cxx +++ b/src/AppParCurves/AppParCurves_MultiBSpCurve.cxx @@ -288,9 +288,9 @@ void AppParCurves_MultiBSpCurve::D2 (const Standard_Integer CuIndex, void AppParCurves_MultiBSpCurve::Dump(Standard_OStream& o) const { - o << "AppParCurves_MultiBSpCurve dump:" << std::endl; - o << " It contains " << NbCurves() << " BSpline curves "<< std::endl; - o << " The poles are: " << std::endl; + o << "AppParCurves_MultiBSpCurve dump:" << '\n'; + o << " It contains " << NbCurves() << " BSpline curves "<< '\n'; + o << " The poles are: " << '\n'; /* for (Standard_Integer i = 1; i <= NbCurves(); i++) { o << " Curve No. " << i << std::endl; if (Dimension(i) == 3) { diff --git a/src/AppParCurves/AppParCurves_MultiCurve.cxx b/src/AppParCurves/AppParCurves_MultiCurve.cxx index e9fd509252..201ebf3a17 100644 --- a/src/AppParCurves/AppParCurves_MultiCurve.cxx +++ b/src/AppParCurves/AppParCurves_MultiCurve.cxx @@ -283,9 +283,9 @@ void AppParCurves_MultiCurve::D2 (const Standard_Integer CuIndex, void AppParCurves_MultiCurve::Dump(Standard_OStream& o) const { - o << "AppParCurves_MultiCurve dump:" << std::endl; - o << " It contains " << NbCurves() << " Bezier curves of degree " << tabPoint->Length()-1 << std::endl; - o << " The poles are: " << std::endl; + o << "AppParCurves_MultiCurve dump:" << '\n'; + o << " It contains " << NbCurves() << " Bezier curves of degree " << tabPoint->Length()-1 << '\n'; + o << " The poles are: " << '\n'; /* for (Standard_Integer i = 1; i <= NbCurves(); i++) { o << " Curve No. " << i << std::endl; if (Dimension(i) == 3) { diff --git a/src/AppParCurves/AppParCurves_MultiPoint.cxx b/src/AppParCurves/AppParCurves_MultiPoint.cxx index faf2c490d8..450bb33838 100644 --- a/src/AppParCurves/AppParCurves_MultiPoint.cxx +++ b/src/AppParCurves/AppParCurves_MultiPoint.cxx @@ -172,20 +172,20 @@ const gp_Pnt2d& AppParCurves_MultiPoint::Point2d (const Standard_Integer Index) void AppParCurves_MultiPoint::Dump(Standard_OStream& o) const { - o << "AppParCurves_MultiPoint dump:" << std::endl; + o << "AppParCurves_MultiPoint dump:" << '\n'; const Standard_Integer aNbPnts3D = NbPoints(), aNbPnts2D = NbPoints2d(); - o << "It contains " << aNbPnts3D << " 3d points and " << aNbPnts2D <<" 2d points." << std::endl; + o << "It contains " << aNbPnts3D << " 3d points and " << aNbPnts2D <<" 2d points." << '\n'; if(aNbPnts3D > 0) { for(Standard_Integer i = tabPoint->Lower(); i <= tabPoint->Upper(); i++) { - o << "3D-Point #" << i << std::endl; + o << "3D-Point #" << i << '\n'; - o << " Pole x = " << (tabPoint->Value(i)/*->Point(j)*/).X() << std::endl; - o << " Pole y = " << (tabPoint->Value(i)/*->Point(j)*/).Y() << std::endl; - o << " Pole z = " << (tabPoint->Value(i)/*->Point(j)*/).Z() << std::endl; + o << " Pole x = " << (tabPoint->Value(i)/*->Point(j)*/).X() << '\n'; + o << " Pole y = " << (tabPoint->Value(i)/*->Point(j)*/).Y() << '\n'; + o << " Pole z = " << (tabPoint->Value(i)/*->Point(j)*/).Z() << '\n'; } } @@ -193,10 +193,10 @@ void AppParCurves_MultiPoint::Dump(Standard_OStream& o) const { for(Standard_Integer i = tabPoint2d->Lower(); i <= tabPoint2d->Upper(); i++) { - o << "2D-Point #" << i << std::endl; + o << "2D-Point #" << i << '\n'; - o << " Pole x = " << (tabPoint2d->Value(i)/*->Point2d(j)*/).X() << std::endl; - o << " Pole y = " << (tabPoint2d->Value(i)/*->Point2d(j)*/).Y() << std::endl; + o << " Pole x = " << (tabPoint2d->Value(i)/*->Point2d(j)*/).X() << '\n'; + o << " Pole y = " << (tabPoint2d->Value(i)/*->Point2d(j)*/).Y() << '\n'; } } } diff --git a/src/Approx/Approx_Curve3d.cxx b/src/Approx/Approx_Curve3d.cxx index ccbab07868..6b4e988981 100644 --- a/src/Approx/Approx_Curve3d.cxx +++ b/src/Approx/Approx_Curve3d.cxx @@ -172,8 +172,8 @@ Approx_Curve3d::Approx_Curve3d(const Handle(Adaptor3d_Curve)& Curve, void Approx_Curve3d::Dump(Standard_OStream& o) const { - o << "******* Dump of ApproxCurve *******" << std::endl; - o << "*******Degree " << Curve()->Degree() << std::endl; - o << "*******NbSegments " << Curve()->NbKnots() - 1 << std::endl; - o << "*******Error " << MaxError() << std::endl; + o << "******* Dump of ApproxCurve *******" << '\n'; + o << "*******Degree " << Curve()->Degree() << '\n'; + o << "*******NbSegments " << Curve()->NbKnots() - 1 << '\n'; + o << "*******Error " << MaxError() << '\n'; } diff --git a/src/Approx/Approx_CurvilinearParameter.cxx b/src/Approx/Approx_CurvilinearParameter.cxx index 77ca7f8e2c..c2582f5f20 100644 --- a/src/Approx/Approx_CurvilinearParameter.cxx +++ b/src/Approx/Approx_CurvilinearParameter.cxx @@ -623,12 +623,12 @@ Approx_CurvilinearParameter::Approx_CurvilinearParameter(const Handle(Adaptor2d_ void Approx_CurvilinearParameter::Dump(Standard_OStream& o) const { - o << "Dump of Approx_CurvilinearParameter" << std::endl; + o << "Dump of Approx_CurvilinearParameter" << '\n'; if (myCase==2 || myCase==3) - o << "myMaxError2d1 = " << myMaxError2d1 << std::endl; + o << "myMaxError2d1 = " << myMaxError2d1 << '\n'; if (myCase==3) - o << "myMaxError2d2 = " << myMaxError2d2 << std::endl; - o << "myMaxError3d = " << myMaxError3d << std::endl; + o << "myMaxError2d2 = " << myMaxError2d2 << '\n'; + o << "myMaxError3d = " << myMaxError3d << '\n'; } //======================================================================= diff --git a/src/Approx/Approx_SweepApproximation.cxx b/src/Approx/Approx_SweepApproximation.cxx index 5e136d2fc9..18f7ee7e89 100644 --- a/src/Approx/Approx_SweepApproximation.cxx +++ b/src/Approx/Approx_SweepApproximation.cxx @@ -732,19 +732,19 @@ Standard_Real Approx_SweepApproximation::TolCurveOnSurf(const Standard_Integer I void Approx_SweepApproximation::Dump(Standard_OStream& o) const { - o << "Dump of SweepApproximation" << std::endl; + o << "Dump of SweepApproximation" << '\n'; if (done) { - o << "Error 3d = " << MaxErrorOnSurf() << std::endl; + o << "Error 3d = " << MaxErrorOnSurf() << '\n'; if (Num2DSS>0) { o << "Error 2d = "; for (Standard_Integer ii=1; ii<=Num2DSS; ii++) { o << Max2dError(ii); - if (ii < Num2DSS) o << " , " << std::endl; + if (ii < Num2DSS) o << " , " << '\n'; } - std::cout << std::endl; + std::cout << '\n'; } - o << tabVKnots->Length()-1 <<" Segment(s) of degree " << vdeg << std::endl; + o << tabVKnots->Length()-1 <<" Segment(s) of degree " << vdeg << '\n'; } - else std::cout << " Not Done " << std::endl; + else std::cout << " Not Done " << '\n'; } diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx b/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx index 5054222ff0..344aad0ed4 100644 --- a/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx +++ b/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx @@ -2184,23 +2184,23 @@ void BRepBuilderAPI_Sewing::Dump() const mapVertices.Add(V2); } } - std::cout << " " << std::endl; - std::cout << " Information " << std::endl; - std::cout << " ===========================================================" << std::endl; - std::cout << " " << std::endl; - std::cout << " Number of input shapes : " << myOldShapes.Extent() << std::endl; - std::cout << " Number of actual shapes : " << myNbShapes << std::endl; - std::cout << " Number of Bounds : " << NbBounds << std::endl; - std::cout << " Number of Sections : " << NbSections << std::endl; - std::cout << " Number of Edges : " << mapEdges.Extent() << std::endl; - std::cout << " Number of Vertices : " << myNbVertices << std::endl; - std::cout << " Number of Nodes : " << mapVertices.Extent() << std::endl; - std::cout << " Number of Free Edges : " << myFreeEdges.Extent() << std::endl; - std::cout << " Number of Contigous Edges : " << myContigousEdges.Extent() << std::endl; - std::cout << " Number of Multiple Edges : " << myMultipleEdges.Extent() << std::endl; - std::cout << " Number of Degenerated Edges : " << myDegenerated.Extent() << std::endl; - std::cout << " ===========================================================" << std::endl; - std::cout << " " << std::endl; + std::cout << " " << '\n'; + std::cout << " Information " << '\n'; + std::cout << " ===========================================================" << '\n'; + std::cout << " " << '\n'; + std::cout << " Number of input shapes : " << myOldShapes.Extent() << '\n'; + std::cout << " Number of actual shapes : " << myNbShapes << '\n'; + std::cout << " Number of Bounds : " << NbBounds << '\n'; + std::cout << " Number of Sections : " << NbSections << '\n'; + std::cout << " Number of Edges : " << mapEdges.Extent() << '\n'; + std::cout << " Number of Vertices : " << myNbVertices << '\n'; + std::cout << " Number of Nodes : " << mapVertices.Extent() << '\n'; + std::cout << " Number of Free Edges : " << myFreeEdges.Extent() << '\n'; + std::cout << " Number of Contigous Edges : " << myContigousEdges.Extent() << '\n'; + std::cout << " Number of Multiple Edges : " << myMultipleEdges.Extent() << '\n'; + std::cout << " Number of Degenerated Edges : " << myDegenerated.Extent() << '\n'; + std::cout << " ===========================================================" << '\n'; + std::cout << " " << '\n'; } //======================================================================= diff --git a/src/BRepCheck/BRepCheck_Shell.cxx b/src/BRepCheck/BRepCheck_Shell.cxx index b0a6ea3875..a1cb708b8d 100644 --- a/src/BRepCheck/BRepCheck_Shell.cxx +++ b/src/BRepCheck/BRepCheck_Shell.cxx @@ -86,7 +86,7 @@ void PrintShape(const TopoDS_Shape& theShape) { if (!theShape.IsNull()) { size_t code = TopTools_ShapeMapHasher{}(theShape); std::cout << TopAbs::ShapeTypeToString (theShape.ShapeType()) << " : " << code - << " " << TopAbs::ShapeOrientationToString(theShape.Orientation()) << std::endl; + << " " << TopAbs::ShapeOrientationToString(theShape.Orientation()) << '\n'; } } diff --git a/src/BRepExtrema/BRepExtrema_DistShapeShape.cxx b/src/BRepExtrema/BRepExtrema_DistShapeShape.cxx index c77cd09de5..805511ba43 100644 --- a/src/BRepExtrema/BRepExtrema_DistShapeShape.cxx +++ b/src/BRepExtrema/BRepExtrema_DistShapeShape.cxx @@ -1120,18 +1120,18 @@ void BRepExtrema_DistShapeShape::Dump(Standard_OStream& o) const Standard_Integer i; Standard_Real r1,r2; - o<< "the distance value is : " << Value()<Statistics(theStream); - theStream << "\n Deleted nodes : " << myNodes->GetListOfDelNodes().Extent() << std::endl; + theStream << "\n Deleted nodes : " << myNodes->GetListOfDelNodes().Extent() << '\n'; theStream << "\n\n Map of Links : \n"; myLinks.Statistics(theStream); - theStream << "\n Deleted links : " << myDelLinks.Extent() << std::endl; + theStream << "\n Deleted links : " << myDelLinks.Extent() << '\n'; theStream << "\n\n Map of elements : \n"; - theStream << "\n Elements : " << myElements.Size() << std::endl; + theStream << "\n Elements : " << myElements.Size() << '\n'; } //======================================================================= diff --git a/src/BRepOffset/BRepOffset_Inter2d.cxx b/src/BRepOffset/BRepOffset_Inter2d.cxx index 8b35e9301f..91cfb57165 100644 --- a/src/BRepOffset/BRepOffset_Inter2d.cxx +++ b/src/BRepOffset/BRepOffset_Inter2d.cxx @@ -618,7 +618,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) std::cout <<"Doubles removed in EdgeInter."< 3) aTol = Draw::Atof(a[3]); - std::cout<<"Info: tolerance is set to "<> buffer; if (IS.fail() || strcmp(buffer,"Curve2ds")) { Standard_SStream aMsg; - aMsg << "BinTools_Curve2dSet::Read: Not a Curve2d table"<> buffer; if (IS.fail() || strcmp(buffer,"Curves")) { Standard_SStream aMsg; - aMsg << "BinTools_CurveSet::Read: Not a Curve table"<> buffer; if (IS.fail() || (strcmp(buffer,"Locations"))) { Standard_SStream aMsg; - aMsg << "BinTools_LocationSet::Read: Not a location table"<> buffer; if (IS.fail() || strcmp(buffer,"TShapes")) { Standard_SStream aMsg; - aMsg << "BinTools_ShapeSet::Read: Not a TShape table"<> buffer; if (IS.fail() || strcmp(buffer,"Surfaces")) { Standard_SStream aMsg; - aMsg << "BinTools_SurfaceSet::Read: Not a surface table"<Lin2d(); } else { - std::cout << "Not yet implemented" << std::endl; + std::cout << "Not yet implemented" << '\n'; } } else if (type1 == STANDARD_TYPE(Geom2d_Line)) { @@ -302,11 +302,11 @@ void Bisector_BisecAna::Perform(const Handle(Geom2d_Curve)& afirstcurve , line2 = L2->Lin2d(); } else { - std::cout << "Not yet implemented" << std::endl; + std::cout << "Not yet implemented" << '\n'; } } else { - std::cout << "Not yet implemented" << std::endl; + std::cout << "Not yet implemented" << '\n'; } switch(cas) { @@ -842,7 +842,7 @@ void Bisector_BisecAna::Perform(const Handle(Geom2d_Curve)& afirstcurve , line = L1->Lin2d(); } else { - std::cout << "Not yet implemented" << std::endl; + std::cout << "Not yet implemented" << '\n'; } switch(cas) { @@ -997,7 +997,7 @@ void Bisector_BisecAna::Perform(const Handle(Geom2d_Curve)& afirstcurve , default: { - std::cout << "Not yet implemented" << std::endl; + std::cout << "Not yet implemented" << '\n'; break; } } @@ -1633,7 +1633,7 @@ void Bisector_BisecAna::Dump(const Standard_Integer , const Standard_Integer Offset) const { Indent (Offset); - std::cout<<"Bisector_BisecAna"<Dump(); } diff --git a/src/Bisector/Bisector_BisecCC.cxx b/src/Bisector/Bisector_BisecCC.cxx index 07f29490ce..c4ae1e413c 100644 --- a/src/Bisector/Bisector_BisecCC.cxx +++ b/src/Bisector/Bisector_BisecCC.cxx @@ -1464,19 +1464,19 @@ void Bisector_BisecCC::Dump(const Standard_Integer , const Standard_Integer Offset) const { Indent (Offset); - std::cout <<"Bisector_BisecCC :"<Path() << "; not found." <<(char)0 << std::endl; + aMsg << "could not find the referenced document: " << aMetaData->Path() << "; not found." <<(char)0 << '\n'; break; case PCDM_RS_PermissionDenied: - aMsg << "Could not find the referenced document: " << aMetaData->Path() << "; permission denied. " <<(char)0 << std::endl; + aMsg << "Could not find the referenced document: " << aMetaData->Path() << "; permission denied. " <<(char)0 << '\n'; break; case PCDM_RS_NoDocument: - aMsg << "Document for appending is not defined." << (char)0 << std::endl; + aMsg << "Document for appending is not defined." << (char)0 << '\n'; break; default: myRetrievableStatus = PCDM_RS_OK; @@ -319,7 +319,7 @@ Handle(CDM_Document) CDF_Application::Retrieve (const Handle(CDM_MetaData)& aMet myRetrievableStatus = theReader->GetStatus(); if (myRetrievableStatus > PCDM_RS_AlreadyRetrieved) { Standard_SStream aMsg; - aMsg << anException << std::endl; + aMsg << anException << '\n'; throw Standard_Failure(aMsg.str().c_str()); } } @@ -392,7 +392,7 @@ void CDF_Application::Read (Standard_IStream& theIStream, myRetrievableStatus = PCDM_RS_FormatFailure; Standard_SStream aMsg; - aMsg << anException << std::endl; + aMsg << anException << '\n'; throw Standard_Failure(aMsg.str().c_str()); } @@ -437,7 +437,7 @@ void CDF_Application::Read (Standard_IStream& theIStream, if (myRetrievableStatus > PCDM_RS_AlreadyRetrieved) { Standard_SStream aMsg; - aMsg << anException << std::endl; + aMsg << anException << '\n'; throw Standard_Failure(aMsg.str().c_str()); } } diff --git a/src/CDM/CDM_Document.cxx b/src/CDM/CDM_Document.cxx index c4abc6d988..3a8076da12 100644 --- a/src/CDM/CDM_Document.cxx +++ b/src/CDM/CDM_Document.cxx @@ -1005,7 +1005,7 @@ Handle(Resource_Manager) CDM_Document::StorageResource() if(myApplication.IsNull()) { Standard_SStream aMsg; aMsg << "this document of format "<< StorageFormat() - << " has not yet been opened by any application. "<< std::endl; + << " has not yet been opened by any application. "<< '\n'; throw Standard_Failure(aMsg.str().c_str()); } return myApplication->Resources(); diff --git a/src/CDM/CDM_MetaData.cxx b/src/CDM/CDM_MetaData.cxx index 5c5e273bb0..53e598776f 100644 --- a/src/CDM/CDM_MetaData.cxx +++ b/src/CDM/CDM_MetaData.cxx @@ -140,7 +140,7 @@ Standard_OStream& CDM_MetaData::Print(Standard_OStream& anOStream) const { if(HasVersion()) anOStream << "," << myVersion ; anOStream << "; Physical situation: "; anOStream << myFileName; - anOStream << std::endl; + anOStream << '\n'; return anOStream; } Standard_OStream& CDM_MetaData::operator << (Standard_OStream& anOStream) { diff --git a/src/ChFi3d/ChFi3d_ChBuilder.cxx b/src/ChFi3d/ChFi3d_ChBuilder.cxx index 237fd058f5..031f52e881 100644 --- a/src/ChFi3d/ChFi3d_ChBuilder.cxx +++ b/src/ChFi3d/ChFi3d_ChBuilder.cxx @@ -894,7 +894,7 @@ ChFi3d_ChBuilder::SimulSurf(Handle(ChFiDS_SurfData)& Data, if (OffsetHGuide.IsNull()) { - std::cout<Edge(), aCheckU1, aCheckU2); if (aCheckU2 < aCheckU1) { // bad orientation - std::cout << "DBRep_DrawableShape : Bad parameters on edge."<Edge(),std::cout); ite.Next(); continue; diff --git a/src/DBRep/DBRep_IsoBuilder.cxx b/src/DBRep/DBRep_IsoBuilder.cxx index 5912ca35c5..57fe42abd8 100644 --- a/src/DBRep/DBRep_IsoBuilder.cxx +++ b/src/DBRep/DBRep_IsoBuilder.cxx @@ -294,11 +294,11 @@ void DBRep_IsoBuilder::LoadIsos (const Handle(DBRep_Face)& Face) const if (!IsDone (UInd)) { std::cout << "DBRep_IsoBuilder:: U iso of parameter: " << UPrm ; switch (Status (UInd)) { - case HatchGen_NoProblem : std::cout << " No Problem" << std::endl ; break ; - case HatchGen_TrimFailure : std::cout << " Trim Failure" << std::endl ; break ; - case HatchGen_TransitionFailure : std::cout << " Transition Failure" << std::endl ; break ; - case HatchGen_IncoherentParity : std::cout << " Incoherent Parity" << std::endl ; break ; - case HatchGen_IncompatibleStates : std::cout << " Incompatible States" << std::endl ; break ; + case HatchGen_NoProblem : std::cout << " No Problem" << '\n' ; break ; + case HatchGen_TrimFailure : std::cout << " Trim Failure" << '\n' ; break ; + case HatchGen_TransitionFailure : std::cout << " Transition Failure" << '\n' ; break ; + case HatchGen_IncoherentParity : std::cout << " Incoherent Parity" << '\n' ; break ; + case HatchGen_IncompatibleStates : std::cout << " Incompatible States" << '\n' ; break ; } } else { Standard_Integer NbDom = Geom2dHatch_Hatcher::NbDomains (UInd) ; @@ -320,11 +320,11 @@ void DBRep_IsoBuilder::LoadIsos (const Handle(DBRep_Face)& Face) const if (!IsDone (VInd)) { std::cout << "DBRep_IsoBuilder:: V iso of parameter: " << VPrm ; switch (Status (VInd)) { - case HatchGen_NoProblem : std::cout << " No Problem" << std::endl ; break ; - case HatchGen_TrimFailure : std::cout << " Trim Failure" << std::endl ; break ; - case HatchGen_TransitionFailure : std::cout << " Transition Failure" << std::endl ; break ; - case HatchGen_IncoherentParity : std::cout << " Incoherent Parity" << std::endl ; break ; - case HatchGen_IncompatibleStates : std::cout << " Incompatible States" << std::endl ; break ; + case HatchGen_NoProblem : std::cout << " No Problem" << '\n' ; break ; + case HatchGen_TrimFailure : std::cout << " Trim Failure" << '\n' ; break ; + case HatchGen_TransitionFailure : std::cout << " Transition Failure" << '\n' ; break ; + case HatchGen_IncoherentParity : std::cout << " Incoherent Parity" << '\n' ; break ; + case HatchGen_IncompatibleStates : std::cout << " Incompatible States" << '\n' ; break ; } } else { Standard_Integer NbDom = Geom2dHatch_Hatcher::NbDomains (VInd) ; diff --git a/src/DDF/DDF.cxx b/src/DDF/DDF.cxx index fe59d15f46..e9820bd672 100644 --- a/src/DDF/DDF.cxx +++ b/src/DDF/DDF.cxx @@ -56,7 +56,7 @@ Standard_Boolean DDF::FindLabel (const Handle(TDF_Data)& DF, { Label.Nullify(); TDF_Tool::Label(DF,Entry,Label,Standard_False); - if (Label.IsNull() && Complain) std::cout << "No label for entry " << Entry <DataFramework(); return Standard_True; } - if (Complain) std::cout <<"framework "<ChangeMap(aHMap); - std::cout << "Map extent = " << anAtt->Extent()<ChangeMap(aHMap); - std::cout << "Map extent = " << anAtt->Extent()<Drawable(Label()); - if (D3D.IsNull()) std::cout<< "DDataStd_DrawPresentation::DrawBuild : null drawable" << std::endl; + if (D3D.IsNull()) std::cout<< "DDataStd_DrawPresentation::DrawBuild : null drawable" << '\n'; myDrawable = D3D; } @@ -380,7 +380,7 @@ void DDataStd_DrawPresentation::DrawDisplay (const TDF_Label& L, return; } } - std::cout<< "DDataStd_DrawPresentation::DrawDisplay : null Label" << std::endl; + std::cout<< "DDataStd_DrawPresentation::DrawDisplay : null Label" << '\n'; } //======================================================================= @@ -401,7 +401,7 @@ void DDataStd_DrawPresentation::DrawErase (const TDF_Label& L, return; } } - std::cout<< "DDataStd_DrawPresentation::DrawErase : null Label" << std::endl; + std::cout<< "DDataStd_DrawPresentation::DrawErase : null Label" << '\n'; } diff --git a/src/DDataStd/DDataStd_TreeBrowser.cxx b/src/DDataStd/DDataStd_TreeBrowser.cxx index 5b6a1afc24..683af31e73 100644 --- a/src/DDataStd/DDataStd_TreeBrowser.cxx +++ b/src/DDataStd/DDataStd_TreeBrowser.cxx @@ -59,7 +59,7 @@ DDataStd_TreeBrowser::DDataStd_TreeBrowser(const TDF_Label& aLabel) //======================================================================= void DDataStd_TreeBrowser::DrawOn(Draw_Display& /*dis*/) const -{ std::cout<<"DDataStd_TreeBrowser"<GetDocument(); @@ -76,7 +76,7 @@ Standard_Boolean DDocStd::GetDocument (Standard_CString& Name, DOC = STDDOC; return Standard_True; } - if (Complain) std::cout << Name << " is not a CAF Document" << std::endl; + if (Complain) std::cout << Name << " is not a CAF Document" << '\n'; return Standard_False; } @@ -93,7 +93,7 @@ Standard_Boolean DDocStd::Find (const Handle(TDocStd_Document)& D, { Label.Nullify(); TDF_Tool::Label(D->GetData(),Entry,Label,Standard_False); - if (Label.IsNull() && Complain) std::cout<<"No label for entry "<DynamicType()->Name() << " is not a CAF document" << std::endl; + S << myDocument->DynamicType()->Name() << " is not a CAF document" << '\n'; } } diff --git a/src/DNaming/DNaming_ModelingCommands.cxx b/src/DNaming/DNaming_ModelingCommands.cxx index eed3de3f02..ca348c30a9 100644 --- a/src/DNaming/DNaming_ModelingCommands.cxx +++ b/src/DNaming/DNaming_ModelingCommands.cxx @@ -187,7 +187,7 @@ static Handle(TFunction_Driver) GetDriver(const TCollection_AsciiString& name) else if(name == "Section") aDrv = new DNaming_BooleanOperationDriver(); else - std::cout << "the specified driver is not supported" <Main()); if(logbook->IsEmpty()) - std::cout << "DNaming_CheckLogBook : is empty" <GetValid(); TDF_MapIteratorOfLabelMap it(aMap); TCollection_AsciiString entry; - std::cout << "DNaming_CheckLogBook : LogBook current state:" <IsEmpty()) - std::cout <<"Wrong Context ..." <Get(); try{ @@ -765,7 +765,7 @@ static Standard_Integer DNaming_XAttachShape (Draw_Interpretor& di, return 1; } catch (Standard_Failure const&) { - std::cout << "EXCEPTION: SELECTION_IMPOSSIBLE" <Label().FindChild(FUNCTION_ARGUMENTS_LABEL).FindChild(ATTACH_ARG), @@ -1546,7 +1546,7 @@ static Standard_Integer DNaming_PntOffset (Draw_Interpretor& theDI, if(isDX || isDY || isDZ) DDF::ReturnLabel(theDI, objLabel); else - std::cout <<"DNaming_PntOffset : Nothing changed" << std::endl; + std::cout <<"DNaming_PntOffset : Nothing changed" << '\n'; return 0; } } @@ -1691,7 +1691,7 @@ static Standard_Boolean MakeSelection (const Handle(TDataStd_UAttribute)& Obj, if(!aSelector.Select(Selection, aContext, Geometry, KeepOrientation)) return Standard_False; }catch (...) { - std::cout << "EXCEPTION: SELECTION_IMPOSSIBLE" <Label(), aResult); } } @@ -1976,7 +1976,7 @@ static Standard_Integer DNaming_TestSingle (Draw_Interpretor& theDI, B.Generated(it1.Value()); TCollection_AsciiString entry; TDF_Tool::Entry(aLabel, entry); - std::cout << "\t" <SetValid(aRLabel); Handle(TNaming_NamedShape) aNS; if(!aRLabel.FindAttribute(TNaming_NamedShape::GetID(),aNS)) { - std::cout <<"%%%WARNING: DNaming_SelectionDriver::NamedShape is not found"<IsEmpty()) { std::cout << "%%%WARNING: DNaming_SelectionDriver::NamedShape is EMPTY on Label = "; - aNS->Label().EntryDump(std::cout); std::cout << std::endl; + aNS->Label().EntryDump(std::cout); std::cout << '\n'; } else { #ifdef OCCT_DEBUG @@ -159,7 +159,7 @@ Standard_Integer DNaming_SelectionDriver::Execute(Handle(TFunction_Logbook)& the } else { aFunction->SetFailure(NOTDONE); - std::cout << "%%%WARNING: DNaming_SelectionDriver::Execute: Selection is Not solved !!!" << std::endl; + std::cout << "%%%WARNING: DNaming_SelectionDriver::Execute: Selection is Not solved !!!" << '\n'; return 1; } return 0; diff --git a/src/Draw/Draw.cxx b/src/Draw/Draw.cxx index 8bf5fbf036..457564fb78 100644 --- a/src/Draw/Draw.cxx +++ b/src/Draw/Draw.cxx @@ -385,7 +385,7 @@ void Draw_Appli(int argc, char** argv, const FDraw_InitAppli Draw_InitAppli) #endif else { - std::cout << "DRAW is running in batch mode" << std::endl; + std::cout << "DRAW is running in batch mode" << '\n'; theCommands.Init(); Tcl_Init(theCommands.Interp()); } @@ -397,7 +397,7 @@ void Draw_Appli(int argc, char** argv, const FDraw_InitAppli Draw_InitAppli) { if (!dout.DefineColor (i, ColorNames[i])) { - std::cout <<"Could not allocate default color " << ColorNames[i] << std::endl; + std::cout <<"Could not allocate default color " << ColorNames[i] << '\n'; } } } @@ -479,8 +479,8 @@ void Draw_Appli(int argc, char** argv, const FDraw_InitAppli Draw_InitAppli) #ifdef _WIN32 ReadInitFile ("ddefault"); #else - std::cout << " the CASROOT variable is mandatory to Run OpenCascade "<< std::endl; - std::cout << "No default file" << std::endl; + std::cout << " the CASROOT variable is mandatory to Run OpenCascade "<< '\n'; + std::cout << "No default file" << '\n'; #endif } } @@ -621,7 +621,7 @@ Standard_Boolean Draw_Interprete(const char* com) { Message_PrinterOStream::SetConsoleTextColor (&std::cout, Message_ConsoleColor_Red, true); } - std::cout << theCommands.Result() << std::endl; + std::cout << theCommands.Result() << '\n'; if (c > 0 && theCommands.ToColorize()) { Message_PrinterOStream::SetConsoleTextColor (&std::cout, Message_ConsoleColor_Default, false); @@ -656,7 +656,7 @@ Standard_Integer Tcl_AppInit (Tcl_Interp *) Standard_Integer Draw_Call (char *c) { Standard_Integer r = theCommands.Eval(c); - std::cout << theCommands.Result() << std::endl; + std::cout << theCommands.Result() << '\n'; return r; } @@ -679,7 +679,7 @@ void Draw::Load (Draw_Interpretor& theDI, if (!aPluginResource->Find (theKey, aPluginLibrary)) { Message::SendFail() << "could not find the resource:" << theKey; - Standard_SStream aMsg; aMsg << "Could not find the resource:" << theKey << std::endl; + Standard_SStream aMsg; aMsg << "Could not find the resource:" << theKey << '\n'; throw Draw_Failure (aMsg.str().c_str()); } diff --git a/src/Draw/Draw_BasicCommands.cxx b/src/Draw/Draw_BasicCommands.cxx index f115d05982..d1e321fa14 100644 --- a/src/Draw/Draw_BasicCommands.cxx +++ b/src/Draw/Draw_BasicCommands.cxx @@ -574,7 +574,7 @@ static unsigned int __stdcall CpuFunc (void * /*param*/) #else static void cpulimitSignalHandler (int) { - std::cout << "Process killed by CPU limit (" << CPU_LIMIT << " sec)" << std::endl; + std::cout << "Process killed by CPU limit (" << CPU_LIMIT << " sec)" << '\n'; exit(2); } static void *CpuFunc(void* /*threadarg*/) @@ -585,7 +585,7 @@ static void *CpuFunc(void* /*threadarg*/) sleep (5); anElapCurrent = clock_t(aTimer.ElapsedTime()); if (CPU_LIMIT >0 && (anElapCurrent) >= CPU_LIMIT) { - std::cout << "Process killed by elapsed limit (" << CPU_LIMIT << " sec)" << std::endl; + std::cout << "Process killed by elapsed limit (" << CPU_LIMIT << " sec)" << '\n'; exit(2); } } @@ -827,7 +827,7 @@ static int dlocale (Draw_Interpretor& di, Standard_Integer n, const char** argv) if (result) di << result; else - std::cout << "Error: unsupported locale specification: " << locale << std::endl; + std::cout << "Error: unsupported locale specification: " << locale << '\n'; return 0; } @@ -1271,7 +1271,7 @@ static int dputs (Draw_Interpretor& theDI, *aStream << theArgVec[anArgIter]; if (!isNoNewline) { - *aStream << std::endl; + *aStream << '\n'; } if (toIntense || aColor != Message_ConsoleColor_Default) diff --git a/src/Draw/Draw_Debug.cxx b/src/Draw/Draw_Debug.cxx index af6d6a743d..33a879ee51 100644 --- a/src/Draw/Draw_Debug.cxx +++ b/src/Draw/Draw_Debug.cxx @@ -32,7 +32,7 @@ Standard_EXPORT const char* Draw_Eval (const char *theCommandStr) OCC_CATCH_SIGNALS Draw_Interpretor& aCommands = Draw::GetInterpretor(); aCommands.Eval (theCommandStr); - std::cout << aCommands.Result() << std::endl; + std::cout << aCommands.Result() << '\n'; return aCommands.Result(); } catch (Standard_Failure const& anException) diff --git a/src/Draw/Draw_GraphicCommands.cxx b/src/Draw/Draw_GraphicCommands.cxx index 6f9cd1ef0b..b1687d17a8 100644 --- a/src/Draw/Draw_GraphicCommands.cxx +++ b/src/Draw/Draw_GraphicCommands.cxx @@ -64,11 +64,11 @@ static Standard_Integer ViewId(const Standard_CString a) { Standard_Integer id = Draw::Atoi(a); if ((id < 0) || (id >= MAXVIEW)) { - std::cout << "Incorrect view-id, must be in 0.."<DumpJson (aSStream); theDI << aSStream; - std::cout << aSStream.str() << std::endl; + std::cout << aSStream.str() << '\n'; return 0; } diff --git a/src/Draw/Draw_VariableCommands.cxx b/src/Draw/Draw_VariableCommands.cxx index 4756691641..d1a4ca64e5 100644 --- a/src/Draw/Draw_VariableCommands.cxx +++ b/src/Draw/Draw_VariableCommands.cxx @@ -230,7 +230,7 @@ static Standard_Integer erase(Draw_Interpretor& di, Standard_Integer n, const ch Handle(Draw_Drawable3D) D = Draw::Get(a[i]); if (D.IsNull()) { if ((a[i][0] == '.') && (a[i][1] == '\0')) - std::cout << "Missed !!!" << std::endl; + std::cout << "Missed !!!" << '\n'; return 0; } } @@ -714,7 +714,7 @@ void Draw::Set(const Standard_CString name, Handle(Draw_Drawable3D) anOldD(reinterpret_cast(aCD)); if (!anOldD.IsNull()) { if (Draw::Drawables().Contains(anOldD) && anOldD->Protected()) { - std::cout << "variable is protected" << std::endl; + std::cout << "variable is protected" << '\n'; return; } anOldD.Nullify(); @@ -776,7 +776,7 @@ Handle(Draw_Drawable3D) Draw::getDrawable (Standard_CString& theName, return Handle(Draw_Drawable3D)(); } - std::cout << "Pick an object" << std::endl; + std::cout << "Pick an object" << '\n'; Handle(Draw_Drawable3D) aDrawable; dout.Select (p_id, p_X, p_Y, p_b); dout.Pick (p_id, p_X, p_Y, 5, aDrawable, 0); @@ -889,7 +889,7 @@ static Standard_Real ParseValue (char*& theName) x = Parse (theName); if (*theName != ')') { - std::cout << "Mismatched parenthesis" << std::endl; + std::cout << "Mismatched parenthesis" << '\n'; } ++theName; break; @@ -949,7 +949,7 @@ static Standard_Real ParseValue (char*& theName) } if (pc > 0) { - std::cout << "Unclosed parenthesis"<< std::endl; + std::cout << "Unclosed parenthesis"<< '\n'; x = 0; } else @@ -989,7 +989,7 @@ static Standard_Real ParseValue (char*& theName) } if (aCommands.Eval (theName) != 0) { - std::cout << "Call of function " << theName << " failed" << std::endl; + std::cout << "Call of function " << theName << " failed" << '\n'; x = 0; } else diff --git a/src/Draw/Draw_Window.cxx b/src/Draw/Draw_Window.cxx index 090fa69b5e..528c6f2909 100644 --- a/src/Draw/Draw_Window.cxx +++ b/src/Draw/Draw_Window.cxx @@ -1325,7 +1325,7 @@ Standard_Boolean Init_Appli() } catch (Standard_Failure const& theFail) { - std::cout << "Cannot open display (" << theFail << "). Interpret commands in batch mode." << std::endl; + std::cout << "Cannot open display (" << theFail << "). Interpret commands in batch mode." << '\n'; return Standard_False; } } diff --git a/src/DrawTrSurf/DrawTrSurf_Point.cxx b/src/DrawTrSurf/DrawTrSurf_Point.cxx index 20cc708de5..6f7c4bf997 100644 --- a/src/DrawTrSurf/DrawTrSurf_Point.cxx +++ b/src/DrawTrSurf/DrawTrSurf_Point.cxx @@ -127,9 +127,9 @@ void DrawTrSurf_Point::Dump (Standard_OStream& S) const std::streamsize prec = S.precision(15); #endif if (is3D) - S << "Point : " << myPoint.X() << ", " << myPoint.Y() << ", " << myPoint.Z() <Value(j)<<" "; - std::cout<Value(i)<<" "; - std::cout<Value(j)<<" "; - std::cout< maxang) maxang = Abs(alpha); } } - std::cout<<"KAlgo angle max sur bord "< maxdist) maxdist = papp.Distance(pbound); } - std::cout<<"Controle approx/contrainte sur bord "<1.e-10; diff --git a/src/GeomFill/GeomFill_FunctionGuide.cxx b/src/GeomFill/GeomFill_FunctionGuide.cxx index 8097e8225a..6bad802b09 100644 --- a/src/GeomFill/GeomFill_FunctionGuide.cxx +++ b/src/GeomFill/GeomFill_FunctionGuide.cxx @@ -255,7 +255,7 @@ GeomFill_FunctionGuide::GeomFill_FunctionGuide gp_XYZ& Q = Pc.ChangeCoord(), DQ(0, 0, 0); //Q if (!isconst) { - std::cout << "Not implemented" << std::endl; + std::cout << "Not implemented" << '\n'; } diff --git a/src/GeomTools/GeomTools_Curve2dSet.cxx b/src/GeomTools/GeomTools_Curve2dSet.cxx index b8553f8beb..c9bb4f98f5 100644 --- a/src/GeomTools/GeomTools_Curve2dSet.cxx +++ b/src/GeomTools/GeomTools_Curve2dSet.cxx @@ -841,7 +841,7 @@ void GeomTools_Curve2dSet::Read(Standard_IStream& IS, const Message_ProgressRan char buffer[255]; IS >> buffer; if (strcmp(buffer,"Curve2ds")) { - std::cout << "Not a Curve2d table"<> buffer; if (strcmp(buffer,"Curves")) { - std::cout << "Not a Curve table"<> buffer; if (strcmp(buffer,"Surfaces")) { - std::cout << "Not a surface table"<= 1) - std::cout << " Lines: " << std::endl; + std::cout << " Lines: " << '\n'; for (i = 1; i <= nblines; i++, Compt++) { @@ -1657,7 +1657,7 @@ static Standard_Integer intersection (Draw_Interpretor& di, } if(nbpoints >= 1) - std::cout << " Points: " << std::endl; + std::cout << " Points: " << '\n'; const Standard_Integer imax = nblines+nbpoints; diff --git a/src/GeometryTest/GeometryTest_TestProjCommands.cxx b/src/GeometryTest/GeometryTest_TestProjCommands.cxx index dfb09217a3..7d8c755d99 100644 --- a/src/GeometryTest/GeometryTest_TestProjCommands.cxx +++ b/src/GeometryTest/GeometryTest_TestProjCommands.cxx @@ -35,7 +35,7 @@ static Standard_Integer xdistcc(Draw_Interpretor& , Standard_Integer n, const ch { if (n < 5) { - std::cout<<" Use xdistcc c1 c2 t1 t2 nbp"< Precision::SquareConfusion()) { Standard_Real aD = sqrt(aDist); - std::cout<<"Surfaces differ for U,V,Dist: "<NxtSg2; std::cout << std::setw(6) << aSegIndices->Conex1; std::cout << std::setw(6) << aSegIndices->Conex2; - std::cout << std::endl; + std::cout << '\n'; } for (i = 1; i <= myNbTData; i++) { @@ -656,7 +656,7 @@ void HLRAlgo_PolyInternalData::Dump () const std::cout << std::setw(6) << aTriangle.Node1; std::cout << std::setw(6) << aTriangle.Node2; std::cout << std::setw(6) << aTriangle.Node3; - std::cout << std::endl; + std::cout << '\n'; } } diff --git a/src/HLRBRep/HLRBRep_InternalAlgo.cxx b/src/HLRBRep/HLRBRep_InternalAlgo.cxx index d8f2b9d141..2b1dc4e7d8 100644 --- a/src/HLRBRep/HLRBRep_InternalAlgo.cxx +++ b/src/HLRBRep/HLRBRep_InternalAlgo.cxx @@ -114,8 +114,8 @@ void HLRBRep_InternalAlgo::Update () if (myDebug) { std::cout << "An exception was caught when preparing the Shape " << i; - std::cout << " and computing its OutLines " << std::endl; - std::cout << anException << std::endl; + std::cout << " and computing its OutLines " << '\n'; + std::cout << anException << '\n'; } DS[i-1] = new HLRBRep_Data(0,0,0); dv = 0; @@ -555,7 +555,7 @@ void HLRBRep_InternalAlgo::PartialHide () Standard_Integer i,n = myShapes.Length(); if (myDebug) - std::cout << " Partial hiding" << std::endl << std::endl; + std::cout << " Partial hiding" << '\n' << '\n'; for (i = 1; i <= n; i++) Hide(i); @@ -575,7 +575,7 @@ void HLRBRep_InternalAlgo::Hide () Standard_Integer i,j,n = myShapes.Length(); if (myDebug) - std::cout << " Total hiding" << std::endl; + std::cout << " Total hiding" << '\n'; for (i = 1; i <= n; i++) Hide(i); @@ -601,7 +601,7 @@ void HLRBRep_InternalAlgo::Hide (const Standard_Integer I) "HLRBRep_InternalAlgo::Hide : unknown Shape"); if (myDebug) - std::cout << " hiding the shape " << I << " by itself" << std::endl; + std::cout << " hiding the shape " << I << " by itself" << '\n'; Select(I); InitEdgeStatus(); @@ -643,7 +643,7 @@ void HLRBRep_InternalAlgo::Hide (const Standard_Integer I, ((MinMaxShBJ->Max[7] - MinMaxShBI->Min[7]) & 0x80008000) == 0) { if (myDebug) { std::cout << " hiding the shape " << I; - std::cout << " by the shape : " << J << std::endl; + std::cout << " by the shape : " << J << '\n'; } SelectEdge(I); SelectFace(J); @@ -716,17 +716,17 @@ void HLRBRep_InternalAlgo::HideSelected (const Standard_Integer I, if (myDebug) { - std::cout << std::endl; - std::cout << "Vertices : " << std::setw(5) << myDS->NbVertices() << std::endl; + std::cout << '\n'; + std::cout << "Vertices : " << std::setw(5) << myDS->NbVertices() << '\n'; std::cout << "Edges : " << std::setw(5) << myDS->NbEdges() << " , "; std::cout << "Selected : " << std::setw(5) << nbSelEdges << " , "; - std::cout << "Visible : " << std::setw(5) << nbVisEdges << std::endl; + std::cout << "Visible : " << std::setw(5) << nbVisEdges << '\n'; std::cout << "Faces : " << std::setw(5) << myDS->NbFaces() << " , "; std::cout << "Selected : " << std::setw(5) << nbSelFaces << " , "; - std::cout << "Simple : " << std::setw(5) << nbFSimp << std::endl; + std::cout << "Simple : " << std::setw(5) << nbFSimp << '\n'; if (SideFace) std::cout << "Side : " << std::setw(5) << nbFSide << " , "; - std::cout << "Cachantes : " << std::setw(5) << nbCache << std::endl << std::endl; + std::cout << "Cachantes : " << std::setw(5) << nbCache << '\n' << '\n'; } } @@ -753,7 +753,7 @@ void HLRBRep_InternalAlgo::HideSelected (const Standard_Integer I, else { if (myDebug && HLRBRep_InternalAlgo_TRACE) { j++; - std::cout << " OwnHiding " << j << " of face : " << f << std::endl; + std::cout << " OwnHiding " << j << " of face : " << f << '\n'; } } Cache.OwnHiding(f); diff --git a/src/HLRTest/HLRTest_OutLiner.cxx b/src/HLRTest/HLRTest_OutLiner.cxx index 782fe974ea..25ca6df304 100644 --- a/src/HLRTest/HLRTest_OutLiner.cxx +++ b/src/HLRTest/HLRTest_OutLiner.cxx @@ -61,7 +61,7 @@ Handle(Draw_Drawable3D) HLRTest_OutLiner::Copy () const void HLRTest_OutLiner::Dump (Standard_OStream& S) const { - S << "This is an outliner" << std::endl; + S << "This is an outliner" << '\n'; } //======================================================================= diff --git a/src/HLRTest/HLRTest_Projector.cxx b/src/HLRTest/HLRTest_Projector.cxx index c4fcf67ee1..6a19c635bf 100644 --- a/src/HLRTest/HLRTest_Projector.cxx +++ b/src/HLRTest/HLRTest_Projector.cxx @@ -67,7 +67,7 @@ void HLRTest_Projector::Dump (Standard_OStream& S) const } S << "\n"; } - S << std::endl; + S << '\n'; } //======================================================================= diff --git a/src/HatchGen/HatchGen_Domain.cxx b/src/HatchGen/HatchGen_Domain.cxx index c0d0a33933..01ea3981ed 100644 --- a/src/HatchGen/HatchGen_Domain.cxx +++ b/src/HatchGen/HatchGen_Domain.cxx @@ -76,19 +76,19 @@ void HatchGen_Domain::Dump (const Standard_Integer Index) const } else { std::cout << "======" ; } - std::cout << "=============================" << std::endl ; + std::cout << "=============================" << '\n' ; if (myHasFirstPoint) { myFirstPoint.Dump (1) ; } else { - std::cout << " Has not a first point" << std::endl ; + std::cout << " Has not a first point" << '\n' ; } if (myHasSecondPoint) { mySecondPoint.Dump (2) ; } else { - std::cout << " Has not a second point" << std::endl ; + std::cout << " Has not a second point" << '\n' ; } - std::cout << "==============================================" << std::endl ; + std::cout << "==============================================" << '\n' ; } diff --git a/src/HatchGen/HatchGen_PointOnElement.cxx b/src/HatchGen/HatchGen_PointOnElement.cxx index bbfaa29eeb..c72af86cea 100644 --- a/src/HatchGen/HatchGen_PointOnElement.cxx +++ b/src/HatchGen/HatchGen_PointOnElement.cxx @@ -206,10 +206,10 @@ void HatchGen_PointOnElement::Dump (const Standard_Integer Index) const } else { std::cout << "------" ; } - std::cout << "---------------" << std::endl ; + std::cout << "---------------" << '\n' ; - std::cout << " Index of the element = " << myIndex << std::endl ; - std::cout << " Parameter on element = " << myParam << std::endl ; + std::cout << " Index of the element = " << myIndex << '\n' ; + std::cout << " Parameter on element = " << myParam << '\n' ; std::cout << " Position on element = " ; switch (myPosit) { case TopAbs_FORWARD : std::cout << "FORWARD (i.e. BEGIN )" ; break ; @@ -217,7 +217,7 @@ void HatchGen_PointOnElement::Dump (const Standard_Integer Index) const case TopAbs_REVERSED : std::cout << "REVERSED (i.e. END )" ; break ; case TopAbs_EXTERNAL : std::cout << "EXTERNAL (i.e. UNKNOWN)" ; break ; } - std::cout << std::endl ; + std::cout << '\n' ; std::cout << " Intersection Type = " ; switch (myType) { case HatchGen_TRUE : std::cout << "TRUE" ; break ; @@ -225,7 +225,7 @@ void HatchGen_PointOnElement::Dump (const Standard_Integer Index) const case HatchGen_TANGENT : std::cout << "TANGENT" ; break ; case HatchGen_UNDETERMINED : std::cout << "UNDETERMINED" ; break ; } - std::cout << std::endl ; + std::cout << '\n' ; std::cout << " State Before = " ; switch (myBefore) { case TopAbs_IN : std::cout << "IN" ; break ; @@ -233,7 +233,7 @@ void HatchGen_PointOnElement::Dump (const Standard_Integer Index) const case TopAbs_ON : std::cout << "ON" ; break ; case TopAbs_UNKNOWN : std::cout << "UNKNOWN" ; break ; } - std::cout << std::endl ; + std::cout << '\n' ; std::cout << " State After = " ; switch (myAfter) { case TopAbs_IN : std::cout << "IN" ; break ; @@ -241,9 +241,9 @@ void HatchGen_PointOnElement::Dump (const Standard_Integer Index) const case TopAbs_ON : std::cout << "ON" ; break ; case TopAbs_UNKNOWN : std::cout << "UNKNOWN" ; break ; } - std::cout << std::endl ; - std::cout << " Beginning of segment = " << (mySegBeg ? "TRUE" : "FALSE") << std::endl ; - std::cout << " End of segment = " << (mySegEnd ? "TRUE" : "FALSE") << std::endl ; + std::cout << '\n' ; + std::cout << " Beginning of segment = " << (mySegBeg ? "TRUE" : "FALSE") << '\n' ; + std::cout << " End of segment = " << (mySegEnd ? "TRUE" : "FALSE") << '\n' ; - std::cout << " ------------------------------------------" << std::endl ; + std::cout << " ------------------------------------------" << '\n' ; } diff --git a/src/HatchGen/HatchGen_PointOnHatching.cxx b/src/HatchGen/HatchGen_PointOnHatching.cxx index 3afd2bb334..d2dde2d967 100644 --- a/src/HatchGen/HatchGen_PointOnHatching.cxx +++ b/src/HatchGen/HatchGen_PointOnHatching.cxx @@ -166,10 +166,10 @@ void HatchGen_PointOnHatching::Dump (const Standard_Integer Index) const } else { std::cout << "------" ; } - std::cout << "------------------" << std::endl ; + std::cout << "------------------" << '\n' ; - std::cout << " Index of the hatching = " << myIndex << std::endl ; - std::cout << " Parameter on hatching = " << myParam << std::endl ; + std::cout << " Index of the hatching = " << myIndex << '\n' ; + std::cout << " Parameter on hatching = " << myParam << '\n' ; std::cout << " Position on hatching = " ; switch (myPosit) { case TopAbs_FORWARD : std::cout << "FORWARD (i.e. BEGIN )" ; break ; @@ -177,7 +177,7 @@ void HatchGen_PointOnHatching::Dump (const Standard_Integer Index) const case TopAbs_REVERSED : std::cout << "REVERSED (i.e. END )" ; break ; case TopAbs_EXTERNAL : std::cout << "EXTERNAL (i.e. UNKNOWN)" ; break ; } - std::cout << std::endl ; + std::cout << '\n' ; std::cout << " State Before = " ; switch (myBefore) { case TopAbs_IN : std::cout << "IN" ; break ; @@ -185,7 +185,7 @@ void HatchGen_PointOnHatching::Dump (const Standard_Integer Index) const case TopAbs_ON : std::cout << "ON" ; break ; case TopAbs_UNKNOWN : std::cout << "UNKNOWN" ; break ; } - std::cout << std::endl ; + std::cout << '\n' ; std::cout << " State After = " ; switch (myAfter) { case TopAbs_IN : std::cout << "IN" ; break ; @@ -193,20 +193,20 @@ void HatchGen_PointOnHatching::Dump (const Standard_Integer Index) const case TopAbs_ON : std::cout << "ON" ; break ; case TopAbs_UNKNOWN : std::cout << "UNKNOWN" ; break ; } - std::cout << std::endl ; - std::cout << " Beginning of segment = " << (mySegBeg ? "TRUE" : "FALSE") << std::endl ; - std::cout << " End of segment = " << (mySegEnd ? "TRUE" : "FALSE") << std::endl ; + std::cout << '\n' ; + std::cout << " Beginning of segment = " << (mySegBeg ? "TRUE" : "FALSE") << '\n' ; + std::cout << " End of segment = " << (mySegEnd ? "TRUE" : "FALSE") << '\n' ; Standard_Integer NbPnt = myPoints.Length () ; if (NbPnt == 0) { - std::cout << " No points on element" << std::endl ; + std::cout << " No points on element" << '\n' ; } else { - std::cout << " Contains " << NbPnt << " points on element" << std::endl ; + std::cout << " Contains " << NbPnt << " points on element" << '\n' ; for (Standard_Integer IPnt = 1 ; IPnt <= NbPnt ; IPnt++) { const HatchGen_PointOnElement& Point = myPoints.Value (IPnt) ; Point.Dump (IPnt) ; } } - std::cout << "----------------------------------------------" << std::endl ; + std::cout << "----------------------------------------------" << '\n' ; } diff --git a/src/IFSelect/IFSelect_ContextModif.cxx b/src/IFSelect/IFSelect_ContextModif.cxx index c69ad559be..13f631799b 100644 --- a/src/IFSelect/IFSelect_ContextModif.cxx +++ b/src/IFSelect/IFSelect_ContextModif.cxx @@ -349,7 +349,7 @@ void IFSelect_ContextModif::TraceModifier if (modif.IsNull()) return; Message_Messenger::StreamBuffer sout = Message::SendInfo(); - sout << "--- Run Modifier:" << std::endl; + sout << "--- Run Modifier:" << '\n'; Handle(IFSelect_Selection) sel = modif->Selection(); if (!sel.IsNull()) sout<<" Selection:"<Label(); else sout<<" (no Selection)"; @@ -359,8 +359,8 @@ void IFSelect_ContextModif::TraceModifier for (Standard_Integer i = 1; i <= nb; i ++) { if (thelist.Value(i) != ' ') ne ++; } - if (nb == ne) sout<<" All Model ("<Length(); - S<<"(List : "<Value(i); - S<<" ["<ToCString())<ToCString())<<'\n'; } } @@ -438,11 +438,11 @@ static void PrintList const Standard_Boolean names, const Standard_Boolean alsolist) const { Standard_Integer iv, nbv = NbValues(Standard_True); - S<< "****************************************************"<PrintLabel (theent, S); } } } - S<MaxNameLength (names ? 0 : -1); if (maxnam == 0) { maxnam = theeditor->MaxNameLength (0); nams = Standard_True; } Standard_Integer nbmod = 0; - if (what != 0) S<<"Mod N0 Name Value"< 0) str = EditedValue (jv); - S<< (str.IsNull() ? "(NULL)" : str->ToCString()) <ToCString()) <<'\n'; // Modified only } else { @@ -509,12 +509,12 @@ static void PrintList Handle(TCollection_HAsciiString) str = OriginalValue (jv); S<ToCString()) <ToCString()) <<'\n'; str = EditedValue (jv); - S<ToCString()) <ToCString()) <<'\n'; } } - if (what == 0) S<<"On "< 0) S<<"Short"<Name()<Name(),themaxco)<<" "<Label()<Name()<Name(),themaxco)<<" "<Label()<<'\n'; } } @@ -127,15 +127,15 @@ Standard_Integer IFSelect_Editor::MaxList (const Standard_Integer num) const (Standard_OStream& S, const Standard_Boolean labels) const { Standard_Integer i, nb = NbValues(); - S<<"**** Editor : "< 0) S<<"Short"<Definition()<Definition()<<'\n'; } } diff --git a/src/IFSelect/IFSelect_Functions.cxx b/src/IFSelect/IFSelect_Functions.cxx index c044591316..e0673acbb3 100644 --- a/src/IFSelect/IFSelect_Functions.cxx +++ b/src/IFSelect/IFSelect_Functions.cxx @@ -106,10 +106,10 @@ static IFSelect_ReturnStatus funstatus // **** Version & cie **** //#58 rln Message_Messenger::StreamBuffer sout = Message::SendInfo(); - sout<<"Processor Version : "<ErrorHandle(); Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (hand) sout << " -- Mode Catch Error now Active" <SetErrorHandle(hand); return IFSelect_RetDone; } @@ -134,20 +134,20 @@ static IFSelect_ReturnStatus fun3 const Standard_CString arg1 = pilot->Arg(1); // **** XRead / Load **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Read/Load : give file name !"<Protocol().IsNull()) { sout<<"Protocol not defined"<WorkLibrary().IsNull()) { sout<<"WorkLibrary not defined"<Protocol().IsNull()) { sout<<"Protocol not defined"<<'\n'; return IFSelect_RetError; } + if (WS->WorkLibrary().IsNull()) { sout<<"WorkLibrary not defined"<<'\n'; return IFSelect_RetError; } IFSelect_ReturnStatus status = WS->ReadFile (arg1); // status : 0 OK, 1 erreur lecture, 2 Fail(try/catch), // -1 fichier non trouve, -2 lecture faite mais resultat vide switch (status) { - case IFSelect_RetVoid : sout<<"file:"<Arg(1); // **** Write All **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Write All : give file name !"<SendAll (arg1); } @@ -176,11 +176,11 @@ static IFSelect_ReturnStatus fun5 // const Standard_CString arg2 = pilot->Arg(2); // **** Write Selected **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 3) { sout<<"Write Selected : give file name + givelist !"<CommandPart( 2)); - if (result.IsNull()) { sout<<"No entity selected"<Length()<Length()<<'\n'; Handle(IFSelect_SelectPointed) sp = new IFSelect_SelectPointed; sp->SetList (result); return WS->SendSelected (arg1,sp); @@ -194,19 +194,19 @@ static IFSelect_ReturnStatus fun6 const Standard_CString arg1 = pilot->Arg(1); // **** Write Entite(s) **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 3) { sout<<"Write Entitie(s) : give file name + n0s entitie(s)!"<Number(pilot->Arg(ia)); if (id > 0) { Handle(Standard_Transient) item = WS->StartingEntity(id); - if (sp->Add(item)) sout<<"Added:no."<Add(item)) sout<<"Added:no."<Arg(ia)<Arg(ia)<<'\n'; ko ++; } } - if (ko > 0) { sout< 0) { sout<SendSelected (arg1,sp); } @@ -218,14 +218,14 @@ static IFSelect_ReturnStatus fun7 const Standard_CString arg1 = pilot->Arg(1); // **** Entity Label **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Give entity number"<HasModel()) { sout<<"No loaded model, abandon"<HasModel()) { sout<<"No loaded model, abandon"<<'\n'; return IFSelect_RetError; } Standard_Integer nument = WS->NumberFromLabel (arg1); if (nument <= 0 || nument > WS->NbStartingEntities()) - { sout<<"Not a suitable number: "<Label in Model : "; WS->Model()->PrintLabel(WS->StartingEntity(nument), sout); - sout<Arg(1); // **** Entity Number **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Give label to search"<HasModel()) { sout<<"No loaded model, abandon"<HasModel()) { sout<<"No loaded model, abandon"<<'\n'; return IFSelect_RetError; } const Handle(Interface_InterfaceModel) &model = WS->Model(); Standard_Integer i, cnt = 0; Standard_Boolean exact = Standard_False; - sout<<" ** Search Entity Number for Label : "<NextNumberForLabel (arg1, 0, exact) ; i != 0; i = model->NextNumberForLabel (arg1, i, exact)) { cnt ++; sout<<" ** Found n0/id:"; model->Print (model->Value(i), sout); - sout< tout le modele"< cette selection, evaluation normale"< cette selection evaluee sur entite n0 num"< tout le modele"<<'\n' + << " sign/compteur + selection -> cette selection, evaluation normale"<<'\n' + <<" sign/compteur + sel + num -> cette selection evaluee sur entite n0 num"<<'\n'; return IFSelect_RetError; } DeclareAndCast(IFSelect_SignCounter,counter,WS->NamedItem(arg1)); @@ -318,7 +318,7 @@ static IFSelect_ReturnStatus funcount for (i = 1; i < onflag; i ++) { sel = WS->GiveSelection(pilot->Arg(i)); if (!suite->AddInput(sel)) { - sout<<"Incorrect definition for applied selection"<SignType(); Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (signtype.IsNull()) sout<<"signtype actually undefined"<Name (signtype); Standard_Integer id = WS->ItemIdent (signtype); - sout<Label()<Label()<<'\n'; if (str.IsNull()) { - if (id > 0) sout<<"signtype : item n0 "< 0) sout<<"signtype : item n0 "<ToCString()<ToCString()<<'\n'; } } - if (argc < 2) sout<<"signtype newitem to change, signtype . to clear"<NamedItem(arg1)); - if (signtype.IsNull()) { sout<<"Not a Signature : "<SetSignType(signtype); return IFSelect_RetDone; @@ -386,22 +386,22 @@ static IFSelect_ReturnStatus funsigncase // **** Sign Case **** Handle(IFSelect_Signature) signcase = GetCasted(IFSelect_Signature,WS->NamedItem(arg1)); Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (signcase.IsNull()) sout<<"Not a Signature : "<IsIntCase(hasmin,valmin,hasmax,valmax)) { sout<<"Signature "<CaseList(); - if (caselist.IsNull()) sout<<"Signature "<Length(); - sout<<"Signature "<Value(i); - sout<Number(arg1); if (num <= 0 || num > WS->NbStartingEntities()) - { sout<<"Not a suitable entity number : "<StartingEntity(num); WS->PrintEntityStatus (ent, sout); return IFSelect_RetVoid; @@ -455,7 +455,7 @@ static IFSelect_ReturnStatus fun11 <<" check CheckList (complete) per message (counting)\n" <<" totalcheck CheckList (complete) per message (listing n0 ents)\n" <<" FAILS CheckList (fails) per message (listing complete)\n" - <<" TOTALCHECK CheckList (complete) per message (listing complete)"<TraceDumpModel(niv); return IFSelect_RetVoid; @@ -484,11 +484,11 @@ static IFSelect_ReturnStatus fundumpent Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc < 2 || (argc == 2 && levmax < 0)) { sout<<"Give n0 or id of entity"; - if (levmax < 0) sout<<" and dump level"< 2) level = atoi(arg2); Handle(Standard_Transient) ent = WS->StartingEntity(num); if ( ent.IsNull() ) { - sout << "No entity with given id " << arg1 << " (" << num << ") is found in the current model" << std::endl; + sout << "No entity with given id " << arg1 << " (" << num << ") is found in the current model" << '\n'; } else { - sout << " -- DUMP Entity n0 " << num << " level " << level << std::endl; + sout << " -- DUMP Entity n0 " << num << " level " << level << '\n'; WL->DumpEntity (WS->Model(),WS->Protocol(),ent,sout,level); Interface_CheckIterator chl = WS->CheckOne (ent); @@ -523,13 +523,13 @@ static IFSelect_ReturnStatus funsign const Standard_CString arg1 = pilot->Arg(1); const Standard_CString arg2 = pilot->Arg(2); Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 3) { sout<<" Give signature name + n0 or id of entity"<NamedItem(arg1)); - if (sign.IsNull()) { sout<<"Not a signature : "<Number(arg2); Handle(Standard_Transient) ent = WS->StartingEntity (num); if (num == 0) return IFSelect_RetError; - sout<<"Entity n0 "<SignValue(sign,ent)<SignValue(sign,ent)<<'\n'; return IFSelect_RetVoid; } @@ -541,14 +541,14 @@ static IFSelect_ReturnStatus funqp const Standard_CString arg1 = pilot->Arg(1); const Standard_CString arg2 = pilot->Arg(2); Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 3) { sout<<" Give 2 numeros or labels : dad son"<NumberFromLabel(arg1); Standard_Integer n2 = WS->NumberFromLabel(arg2); - sout<<"QueryParent for dad:"<QueryParent(WS->StartingEntity(n1),WS->StartingEntity(n2)); - if (qp < 0) sout<Arg(1); // **** NewInt **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 1) { sout<<"Donner la valeur entiere pour IntParam"<= 1) intpar->SetValue(atoi(arg1)); return pilot->RecordItem (intpar); @@ -594,7 +594,7 @@ static IFSelect_ReturnStatus fun15 // **** SetInt **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc < 3) - { sout<<"Donner 2 arguments : nom Parametre et Valeur"<NamedItem(arg1)); if (!WS->SetIntValue(par,val)) return IFSelect_RetFail; @@ -609,7 +609,7 @@ static IFSelect_ReturnStatus fun16 const Standard_CString arg1 = pilot->Arg(1); // **** NewText **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 1) { sout<<"Donner la valeur texte pour TextParam"<= 1) textpar->AssignCat(arg1); return pilot->RecordItem (textpar); @@ -625,7 +625,7 @@ static IFSelect_ReturnStatus fun17 // **** SetText **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc < 3) - { sout<<"Donner 2 arguments : nom Parametre et Valeur"<NamedItem(arg1)); if (!WS->SetTextValue(par,arg2)) return IFSelect_RetFail; return IFSelect_RetDone; @@ -639,7 +639,7 @@ static IFSelect_ReturnStatus fun19 const Standard_CString arg1 = pilot->Arg(1); // **** DumpSel **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Give 1 argument : Selection Name"<DumpSelection (GetCasted(IFSelect_Selection,WS->NamedItem(arg1))); return IFSelect_RetVoid; } @@ -656,7 +656,7 @@ static IFSelect_ReturnStatus fun20 char mode = pilot->Arg(0)[0]; // givelist/makelist if (mode == 'g') mode = pilot->Arg(0)[4]; // l list s short p pointed Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Give Entity ID, or Selection Name [+ optional other selection or entity]"<NamedItem (arg1); pnt = GetCasted(IFSelect_SelectPointed,item); if (!pnt.IsNull()) { - sout<Clear(); } else if (!item.IsNull()) { - sout<StartingNumber (iter.Value()); - sout<SetList (result); - sout<<"List set to a SelectPointed : "<Arg(1)<Arg(1)<<'\n'; + sout<<"Later editable by command setlist"<<'\n'; } return IFSelect_RetVoid; @@ -706,12 +706,12 @@ static IFSelect_ReturnStatus fun20c Standard_Integer argc = pilot->NbWords(); // **** GiveCount **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Give Entity ID, or Selection Name [+ optional other selection or entity]"<EvaluateSelection(GetCasted(IFSelect_Selection,WS->NamedItem(arg1))); Handle(TColStd_HSequenceOfTransient) result = IFSelect_Functions::GiveList (WS,pilot->CommandPart(1)); if (result.IsNull()) return IFSelect_RetError; - sout<CommandPart(1)<<" : List of "<Length()<<" Entities"<CommandPart(1)<<" : List of "<Length()<<" Entities"<<'\n'; return IFSelect_RetVoid; } @@ -722,14 +722,14 @@ static IFSelect_ReturnStatus funselsuite Standard_Integer argc = pilot->NbWords(); // **** SelSuite **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Give Entity ID, or Selection Name [+ optional other selection or entity]"<EvaluateSelection(GetCasted(IFSelect_Selection,WS->NamedItem(arg1))); Handle(IFSelect_SelectSuite) selsuite = new IFSelect_SelectSuite; for (Standard_Integer i = 1; i < argc; i ++) { Handle(IFSelect_Selection) sel = WS->GiveSelection(pilot->Arg(i)); if (!selsuite->AddInput(sel)) { - sout<Arg(i-1)<<" : not a SelectDeduct, no more can be added. Abandon"<Arg(i-1)<<" : not a SelectDeduct, no more can be added. Abandon"<<'\n'; return IFSelect_RetError; } } @@ -767,7 +767,7 @@ static IFSelect_ReturnStatus fun22 if (mode <= 0) { if (mode < 0) sout<<"Give a suitable mode"; sout<<" Available Modes :\n" - <<" a : all data g : graph+check c : check p : selectpointed"<ClearData (mode); @@ -782,7 +782,7 @@ static IFSelect_ReturnStatus fun24 // **** Item Label **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); TCollection_AsciiString label; - if (argc < 2) { sout<<" Give label to search"<Arg(i)); if (i < argc-1) label.AssignCat(" "); @@ -790,14 +790,14 @@ static IFSelect_ReturnStatus fun24 for (int mode = 0; mode <= 2; mode ++) { int nbitems = 0; int id; sout<<"Searching label : "<NextIdentForLabel(label.ToCString(), 0,mode) ; id != 0; id = WS->NextIdentForLabel(label.ToCString(),id,mode)) { sout<<" "<Arg(1); // **** Save (Dump) **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Donner nom du Fichier"<Arg(1); // **** Restore (Dump) **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Donner nom du Fichier"< 0) sout << "-- Erreur Lecture Fichier "< 0) sout << "-- Erreur Lecture Fichier "<Value(i)->String().ToCString(), arg2, aPatternLen) != 0) { continue; } sout<Value(i)->String(); - sout<<" : "<Value(i)->ToCString())<Value(i)->ToCString())<<'\n'; } return IFSelect_RetVoid; } else if (atoi(arg1) > 0) { Standard_Integer use = atoi (arg1); WS->TraceStatics (use); } else { - if (argc > 2) sout<<" FORMER STATUS of Static Parameter "< 2) sout<<" FORMER STATUS of Static Parameter "< Print (sout); - else sout<<" Value : "<SentFiles(); Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (list.IsNull()) - { sout<<"List of Sent Files not enabled"<Length(); - sout<<" Sent Files : "<Value(i)->ToCString()<Value(i)->ToCString()<<'\n'; return IFSelect_RetVoid; } @@ -929,9 +929,9 @@ static IFSelect_ReturnStatus fun30 // **** FilePrefix **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc < 2) { - if (WS->FilePrefix().IsNull()) sout<<"Pas de prefixe defini"<FilePrefix()->ToCString()<FilePrefix().IsNull()) sout<<"Pas de prefixe defini"<<'\n'; + else sout<<"Prefixe : "<FilePrefix()->ToCString()<<'\n'; + sout<<"Pour changer : filepref newprefix"<<'\n'; return IFSelect_RetVoid; } WS->SetFilePrefix(arg1); @@ -947,9 +947,9 @@ static IFSelect_ReturnStatus fun31 // **** FileExtension **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc < 2) { - if (WS->FileExtension().IsNull()) sout<<"Pas d extension definie"<FileExtension()->ToCString()<FileExtension().IsNull()) sout<<"Pas d extension definie"<<'\n'; + else sout<<"Extension : "<FileExtension()->ToCString()<<'\n'; + sout<<"Pour changer : fileext newext"<<'\n'; return IFSelect_RetVoid; } WS->SetFileExtension(arg1); @@ -965,12 +965,12 @@ static IFSelect_ReturnStatus fun32 const Standard_CString arg2 = pilot->Arg(2); // **** FileRoot **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Donner Dispatch et nom de Root"<NamedItem(arg1)); if (argc < 3) { - if (WS->FileRoot(disp).IsNull()) sout<<"Pas de racine definie pour "<FileRoot(disp)->ToCString()<FileRoot(disp).IsNull()) sout<<"Pas de racine definie pour "<FileRoot(disp)->ToCString()<<'\n'; + sout<<"Pour changer : fileroot nomdisp newroot"<<'\n'; return IFSelect_RetVoid; } if (!WS->SetFileRoot(disp,arg2)) return IFSelect_RetFail; @@ -986,9 +986,9 @@ static IFSelect_ReturnStatus fun33 // **** Default File Root **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc < 2) { - if (WS->DefaultFileRoot().IsNull()) sout<<"Pas de racine par defaut definie"<DefaultFileRoot()->ToCString()<DefaultFileRoot().IsNull()) sout<<"Pas de racine par defaut definie"<<'\n'; + else sout<<"Racine par defaut : "<DefaultFileRoot()->ToCString()<<'\n'; + sout<<"Pour changer : filedef newdef"<<'\n'; return IFSelect_RetVoid; } WS->SetDefaultFileRoot(arg1); @@ -1002,18 +1002,18 @@ static IFSelect_ReturnStatus fun34 // **** EvalFile **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (!WS->HasModel()) - { sout<<"Pas de Modele charge, abandon"<EvaluateFile(); Standard_Integer nbf = WS->NbFiles(); for (Standard_Integer i = 1; i <= nbf; i ++) { Handle(Interface_InterfaceModel) mod = WS->FileModel(i); if (mod.IsNull()) - { sout<<"Modele "<FileName(i); sout<<"Fichier n0 "<NbEntities()<<" Nom: "; - sout<ClearShareOut(Standard_True); for (Standard_Integer i = 1; i < argc; i ++) { DeclareAndCast(IFSelect_Dispatch,disp,WS->NamedItem(pilot->Arg(i))); if (disp.IsNull()) { - sout<<"Pas un dispatch:"<Arg(i)<<", Splitt abandonne"<Arg(i)<<", Splitt abandonne"<<'\n'; stat = IFSelect_RetError; } else WS->SetActive(disp,Standard_True); @@ -1068,7 +1068,7 @@ static IFSelect_ReturnStatus fun37 else { Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc<2) sout<<"Donner un Mode - "; - sout<<"Modes possibles : l list, c compute, u undo, f forget"<SetRemaining(numod)) return IFSelect_RetVoid; @@ -1084,17 +1084,17 @@ static IFSelect_ReturnStatus fun38 const Standard_CString arg2 = pilot->Arg(2); // **** SetModelContent **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 3) { sout<<"Donner nom selection et mode (k=keep,r=remove)"<NamedItem(arg1)); if (sel.IsNull()) - { sout<<"Pas de Selection de Nom : "<SetModelContent(sel,keepmode)) sout<<" Done"<SetModelContent(sel,keepmode)) sout<<" Done"<<'\n'; + else sout<<" Result empty, ignored"<<'\n'; return IFSelect_RetDone; } @@ -1115,29 +1115,29 @@ static IFSelect_ReturnStatus fun41 const Standard_CString arg1 = pilot->Arg(1); // **** Modifier **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Donner Nom du Modifier"<NamedItem(arg1)); if (modif.IsNull()) - { sout<<"Pas de Modifier de Nom : "<Dispatch(); - sout<<"Modifier : "<Label()<Label()<<'\n'; Standard_Integer rank = WS->ModifierRank(modif); if (modif->IsKind(STANDARD_TYPE(IFSelect_Modifier))) sout<< "Model Modifier n0." << rank; else sout<< "File Modifier n0." << rank; - if (disp.IsNull()) sout<<" Applique a tous les Dispatchs" << std::endl; + if (disp.IsNull()) sout<<" Applique a tous les Dispatchs" << '\n'; else { sout << " Dispatch : "<Label(); if (WS->HasName(disp)) sout << " - Nom:"<Name(disp)->ToCString(); - sout<Selection(); if (!sel.IsNull()) sout<<" Selection : "<< sel->Label(); if (WS->HasName(sel)) sout<<" - Nom:"<< WS->Name(sel)->ToCString(); - sout<NamedItem(arg1)); if (modif.IsNull()) - { sout<<"Pas un nom de Modifier : "<NamedItem(arg2)); if (sel.IsNull()) - { sout<<"Pas un nom de Selection : "<SetItemSelection(modif,sel)) return IFSelect_RetFail; return IFSelect_RetDone; @@ -1176,16 +1176,16 @@ static IFSelect_ReturnStatus fun43 Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc < 2) { sout<<"Donner Nom Modifier; + Nom Dispatch ou Transformer optionnel :\n" <<" - rien : tous Dispatches\n - Dispatch : ce Dispatch seul\n" - <<" - Transformer : pas un Dispatch mais un Transformer"<NamedItem(arg1)); if (modif.IsNull()) - { sout<<"Pas un nom de Modifier : "<NamedItem(arg2); if (item.IsNull()) - { sout<<"Pas un nom connu : "<ShareOut(); if (!WS->SetAppliedModifier(modif,item)) return IFSelect_RetFail; @@ -1200,10 +1200,10 @@ static IFSelect_ReturnStatus fun44 const Standard_CString arg1 = pilot->Arg(1); // **** ResetApplied (modifier) **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Designer un modifier"<NamedItem(arg1)); if (modif.IsNull()) - { sout<<"Pas un nom de Modifier : "<ResetAppliedModifier(modif)) return IFSelect_RetFail; return IFSelect_RetDone; } @@ -1218,14 +1218,14 @@ static IFSelect_ReturnStatus fun45 const Standard_CString arg3 = pilot->Arg(3); // **** ModifMove **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 4) { sout<<"modifmove MF rang1 rang2, M pour Model F pour File"<ChangeModifierRank(formodel,before,after)) return IFSelect_RetFail; return IFSelect_RetDone; } @@ -1239,13 +1239,13 @@ static IFSelect_ReturnStatus fun51 const Standard_CString arg2 = pilot->Arg(2); // **** DispSel **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 3) { sout<<"Donner Noms Dispatch et Selection Finale"<NamedItem(arg1)); if (disp.IsNull()) - { sout<<"Pas un nom de Dispatch : "<NamedItem(arg2)); if (sel.IsNull()) - { sout<<"Pas un nom de Selection : "<SetItemSelection(disp,sel)) return IFSelect_RetFail; return IFSelect_RetDone; } @@ -1276,10 +1276,10 @@ static IFSelect_ReturnStatus fun_dispcount const Standard_CString arg1 = pilot->Arg(1); // **** DispCount **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Donner Nom IntParam pour Count"<NamedItem(arg1)); if (par.IsNull()) - { sout<<"Pas un nom de IntParam : "<SetCount (par); return pilot->RecordItem(disp); @@ -1293,10 +1293,10 @@ static IFSelect_ReturnStatus fun_dispfiles const Standard_CString arg1 = pilot->Arg(1); // **** DispFiles **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Donner Nom IntParam pour NbFiles"<NamedItem(arg1)); if (par.IsNull()) - { sout<<"Pas un nom de IntParam : "<SetCount (par); return pilot->RecordItem(disp); @@ -1311,10 +1311,10 @@ static IFSelect_ReturnStatus fun_dispsign const Standard_CString arg1 = pilot->Arg(1); // **** DispFiles **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Donner Nom Signature"<NamedItem(arg1)); if (sig.IsNull()) - { sout<<"Pas un nom de Signature : "<SetSignCounter (new IFSelect_SignCounter(sig)); return pilot->RecordItem(disp); @@ -1329,18 +1329,18 @@ static IFSelect_ReturnStatus fun56 const Standard_CString arg1 = pilot->Arg(1); // **** Dispatch **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Donner Nom du Dispatch"<NamedItem(arg1)); - if (disp.IsNull()) { sout<<"Pas un dispatch : "<DispatchRank(disp); sout<<"Dispatch de Nom : "<ItemSelection(disp); Handle(TCollection_HAsciiString) selname = WS->Name(sel); - if (sel.IsNull()) sout<<"Pas de Selection Finale"<ItemIdent(sel)<ToCString()<ItemIdent(sel)<<'\n'; + else sout<<"Selection Finale : "<ToCString()<<'\n'; if (disp->HasRootName()) sout<<"-- Racine nom de fichier : " - <RootName()->ToCString()<RootName()->ToCString()<<'\n'; return IFSelect_RetVoid; } @@ -1352,7 +1352,7 @@ static IFSelect_ReturnStatus fun57 const Standard_CString arg1 = pilot->Arg(1); // **** Remove **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Give Name to Remove !"<RemoveNamedItem(arg1)) return IFSelect_RetFail; return IFSelect_RetDone; } @@ -1366,18 +1366,18 @@ static IFSelect_ReturnStatus fun58 // **** EvalDisp **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc < 3) { sout<<"evaldisp mode disp [disp ...] : Mode + Name(s) of Dispatch(es). Mode:\n" - <<" 0 brief 1 +forgotten ents 2 +duplicata 3 1+2"<NamedItem(pilot->Arg(i))); if (disp.IsNull()) - { sout<<"Not a dispatch:"<Arg(i)<Arg(i)<<'\n'; OK = Standard_False; } } if (!OK) { - sout<<"Some of the parameters are not correct"<NamedItem(pilot->Arg(2))); Handle(IFSelect_Dispatch) disp = IFSelect_Functions::GiveDispatch (WS,pilot->Arg(2),Standard_True); if (disp.IsNull()) - { sout<<"Not a dispatch:"<Arg(2)<Arg(2)<<'\n'; return IFSelect_RetError; } Handle(IFSelect_Selection) selsav = disp->FinalSelection(); Handle(IFSelect_Selection) sel; if (argc > 3) { @@ -1421,9 +1421,9 @@ static IFSelect_ReturnStatus fun_evaladisp } if (sel.IsNull() && selsav.IsNull()) - { sout<<"No Selection nor GiveList defined"< 3) sout<<"GiveList is empty, hence computed from the Selection of the Dispatch"< 3) sout<<"GiveList is empty, hence computed from the Selection of the Dispatch"<<'\n'; sel = selsav; } disp->SetFinalSelection(sel); @@ -1446,19 +1446,19 @@ static IFSelect_ReturnStatus fun_writedisp if (argc < 3) { sout<<"writedisp filename disp [givelist] : FileName + Dispatch [+ GiveList]\n If GiveList not given, computed from Selection of the Dispatch.\n" <<"FileName : rootname.ext will gives rootname_1.ext etc...\n" <<" path/rootname.ext gives path/rootname_1.ext etc...\n" - <<"See also : evaladisp"<NamedItem(pilot->Arg(2))); Handle(IFSelect_Dispatch) disp = IFSelect_Functions::GiveDispatch (WS,pilot->Arg(2),Standard_True); if (disp.IsNull()) - { sout<<"Not a dispatch:"<Arg(2)<Arg(2)<<'\n'; return IFSelect_RetError; } Handle(IFSelect_Selection) selsav = disp->FinalSelection(); Handle(IFSelect_Selection) sel; if (argc > 3) { @@ -1470,9 +1470,9 @@ static IFSelect_ReturnStatus fun_writedisp } if (sel.IsNull() && selsav.IsNull()) - { sout<<"No Selection nor GiveList defined"< 3) sout<<"GiveList is empty, hence computed from the Selection of the Dispatch"< 3) sout<<"GiveList is empty, hence computed from the Selection of the Dispatch"<<'\n'; sel = selsav; } @@ -1501,7 +1501,7 @@ static IFSelect_ReturnStatus fun59 Standard_Integer mode = 0; Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc < 2) sout << " -- mode par defaut 0\n"; - else { mode = atoi(arg1); sout << " -- mode : " << mode << std::endl; } + else { mode = atoi(arg1); sout << " -- mode : " << mode << '\n'; } WS->EvaluateComplete(mode); return IFSelect_RetVoid; } @@ -1526,23 +1526,23 @@ static IFSelect_ReturnStatus fun61 const Standard_CString arg1 = pilot->Arg(1); // **** RunTransformer **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Donner Nom de Transformer"<NamedItem(arg1)); Standard_Integer effect = WS->RunTransformer(tsf); switch (effect) { - case -4 : sout<<"Edition sur place, nouveau Protocole, erreur recalcul graphe"< 0) ? IFSelect_RetDone : IFSelect_RetFail); @@ -1584,7 +1584,7 @@ static IFSelect_ReturnStatus fun6465 } Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (modif.IsNull()) - { sout<<"Pas un nom de Modifier : "<RunModifierSelected (modif,sp,runcopy); // sout<<"Modifier applique sur TransformStandard #"<ItemIdent(tsf)< 0) ? IFSelect_RetDone : IFSelect_RetFail); @@ -1625,7 +1625,7 @@ static IFSelect_ReturnStatus fun66 if (argc >= 2) opt = pilot->Word(1).Value(1); Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (opt != 'f' && opt != 'l') - { sout<<"Donner option : f -> root-first l -> root-last"< root-first l -> root-last"<<'\n'; return IFSelect_RetError; } return pilot->RecordItem(new IFSelect_ModifReorder(opt == 'l')); } @@ -1637,12 +1637,12 @@ static IFSelect_ReturnStatus fun70 const Standard_CString arg1 = pilot->Arg(1); // **** SelToggle **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Donner Nom de Selection"<NamedItem(arg1)); if (!WS->ToggleSelectExtract(sel)) - { sout<<"Pas une SelectExtract : "<IsReversedSelectExtract(sel)) sout<IsReversedSelectExtract(sel)) sout<Arg(2); // **** SelInput **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 3) { sout<<"Donner Noms Selections cible et input"<NamedItem(arg1)); DeclareAndCast(IFSelect_Selection,sou,WS->NamedItem(arg2)); if (sel.IsNull() || sou.IsNull()) - { sout<<"Incorrect : "<SetInputSelection(sel,sou)) { - sout<<"Nom incorrect ou Selection "< : Range de a \n" <<" tout seul : Range n0 \n from : Range From \n" - <<" until : Range Until "< : Range Until "<<'\n'; return IFSelect_RetVoid; } @@ -1697,13 +1697,13 @@ static IFSelect_ReturnStatus fun73 Handle(IFSelect_SelectRange) sel; // Range From if (pilot->Word(1).IsEqual("from")) { - if (argc < 3) { sout<<"Forme admise : from "<"<<'\n'; return IFSelect_RetError; } low = GetCasted(IFSelect_IntParam,WS->NamedItem(arg2)); sel = new IFSelect_SelectRange; sel->SetFrom (low); // Range Until } else if (pilot->Word(1).IsEqual("until")) { - if (argc < 3) { sout<<"Forme admise : until "<"<<'\n'; return IFSelect_RetError; } up = GetCasted(IFSelect_IntParam,WS->NamedItem(arg2)); sel = new IFSelect_SelectRange; sel->SetUntil (up); @@ -1749,15 +1749,15 @@ static IFSelect_ReturnStatus fun76 Handle(IFSelect_Selection) sel = new IFSelect_SelectDiff; if (sel.IsNull()) return IFSelect_RetFail; Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 3) sout<<"Diff sans input : ne pas oublier de les definir (ctlmain, ctlsec)!"<NamedItem(arg1)); DeclareAndCast(IFSelect_Selection,selsec ,WS->NamedItem(arg2)); if (argc >= 2) if (!WS->SetControl(sel,selmain,Standard_True)) - sout<<"Echec ControlMain:"<= 3) if (!WS->SetControl(sel,selsec,Standard_False)) - sout<<"Echec ControlSecond:"<RecordItem (sel); } @@ -1770,11 +1770,11 @@ static IFSelect_ReturnStatus fun77 const Standard_CString arg2 = pilot->Arg(2); // **** SelControlMain **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 3) { sout<<"Donner Noms de Control et MainInput"<NamedItem(arg1)); DeclareAndCast(IFSelect_Selection,selmain,WS->NamedItem(arg2)); if (WS->SetControl(sel,selmain,Standard_True)) return IFSelect_RetDone; - sout<<"Nom incorrect ou Selection "<Arg(2); // **** SelControlSecond **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 3) { sout<<"Donner Noms de Control et SecondInput"<NamedItem(arg1)); DeclareAndCast(IFSelect_Selection,seldif,WS->NamedItem(arg2)); if (WS->SetControl(sel,seldif,Standard_False)) return IFSelect_RetDone; - sout<<"Nom incorrect ou Selection "<Arg(2); // **** SelCombAdd **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 3) { sout<<"Donner n0 Combine et une Input"<NamedItem(arg1)); DeclareAndCast(IFSelect_Selection,seladd,WS->NamedItem(arg2)); if (WS->CombineAdd(sel,seladd)) return IFSelect_RetDone; - sout<<"Nom incorrect ou Selection "<Arg(2); // **** SelCombRem **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 3) { sout<<"Donner n0 Combine et RANG a supprimer"<NamedItem(arg1)); DeclareAndCast(IFSelect_Selection,inp,WS->NamedItem(arg2)); if (WS->CombineRemove(sel,inp)) return IFSelect_RetDone; - sout<<"Nom incorrect ou Selection "<Arg(1); // **** SelEntNumber **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Donner Nom IntParam pour n0 Entite"<NamedItem(arg1)); Handle(IFSelect_SelectEntityNumber) sel = new IFSelect_SelectEntityNumber; sel->SetNumber(par); @@ -1875,7 +1875,7 @@ static IFSelect_ReturnStatus fun85 const Standard_CString arg1 = pilot->Arg(1); // **** SelTextType Exact **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Donner le TYPE a selectionner"<RecordItem (new IFSelect_SelectSignature (new IFSelect_SignType,arg1,Standard_True)); } @@ -1908,7 +1908,7 @@ static IFSelect_ReturnStatus fun89 const Standard_CString arg1 = pilot->Arg(1); // **** SelTextType Contain ** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Donner le TYPE a selectionner"<RecordItem (new IFSelect_SelectSignature (new IFSelect_SignType,arg1,Standard_False)); } @@ -1923,7 +1923,7 @@ static IFSelect_ReturnStatus fun90 (pilot->Session(),pilot->CommandPart(1)); if (list.IsNull()) return IFSelect_RetFail; Message_Messenger::StreamBuffer sout = Message::SendInfo(); - sout<<"SelectPointed : "<Length()<<" entities"<Length()<<" entities"<<'\n'; sp->AddList (list); } return pilot->RecordItem (sp); @@ -1940,22 +1940,22 @@ static IFSelect_ReturnStatus fun91 if (argc < 2) { sout<<"Donner NOM SelectPointed + Option(s) :\n" <<" aucune : liste des entites pointees\n" - <<" 0: Clear +nn ajout entite nn -nn enleve nn /nn toggle nn"<NamedItem(arg1)); - if (sp.IsNull()) { sout<<"Pas une SelectPointed:"<Model(); // pour Print if (argc == 2) { // listage simple Standard_Integer nb = sp->NbItems(); - sout<<" SelectPointed : "<Item(i); Standard_Integer id = WS->StartingNumber(pointed); if (id == 0) sout <<" (inconnu)"; else { sout <<" "; model->Print (pointed, sout); } } - if (nb > 0) sout< 0) sout<<'\n'; return IFSelect_RetDone; } @@ -1963,28 +1963,28 @@ static IFSelect_ReturnStatus fun91 const TCollection_AsciiString argi = pilot->Word(ia); Standard_Integer id = pilot->Number(&(argi.ToCString())[1]); if (id == 0) { - if (!argi.IsEqual("0")) sout<<"Incorrect,ignore:"<Clear(); } + if (!argi.IsEqual("0")) sout<<"Incorrect,ignore:"<Clear(); } } else if (argi.Value(1) == '-') { Handle(Standard_Transient) item = WS->StartingEntity(id); if (sp->Remove(item)) sout<<"Removed:no."<Print (item, sout); } else if (argi.Value(1) == '/') { Handle(Standard_Transient) item = WS->StartingEntity(id); if (sp->Remove(item)) sout<<"Toggled:n0."<Print (item, sout); } else if (argi.Value(1) == '+') { Handle(Standard_Transient) item = WS->StartingEntity(id); if (sp->Add(item)) sout<<"Added:no."<Print (item, sout); } else { - sout<<"Ignore:"<Session(); // **** SelSignature **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 3) { sout<<"Give name of Signature or Counter, text + option exact(D) else contains"< 3) { if (pilot->Arg(3)[0] == 'c') exact = Standard_False; } @@ -2018,7 +2018,7 @@ static IFSelect_ReturnStatus fun93 if (!sign.IsNull()) sel = new IFSelect_SelectSignature (sign,arg2,exact); else if (!cnt.IsNull()) sel = new IFSelect_SelectSignature (cnt,arg2,exact); - else { sout<RecordItem(sel); } @@ -2031,9 +2031,9 @@ static IFSelect_ReturnStatus fun94 Handle(IFSelect_WorkSession) WS = pilot->Session(); // **** SignCounter **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Donner nom signature"<NamedItem(arg1)); - if (sign.IsNull()) { sout<RecordItem(cnt); } @@ -2046,9 +2046,9 @@ static IFSelect_ReturnStatus funbselected Handle(IFSelect_WorkSession) WS = pilot->Session(); // **** NbSelected = GraphCounter **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Donner nom selection (deduction) a appliquer"<GiveSelection(arg1)); - if (applied.IsNull()) { sout<SetApplied (applied); return pilot->RecordItem(cnt); @@ -2063,7 +2063,7 @@ static IFSelect_ReturnStatus fun_editlist { Standard_Integer argc = pilot->NbWords(); Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Give the name of an EditForm or an Editor"<Arg(1); const Standard_CString arg2 = pilot->Arg(2); @@ -2074,7 +2074,7 @@ static IFSelect_ReturnStatus fun_editlist DeclareAndCast(IFSelect_EditForm,edf,WS->NamedItem(arg1)); Handle(IFSelect_Editor) edt; if (!edf.IsNull()) { - sout<<"Print EditForm "<Editor(); if (argc < 3) { @@ -2083,14 +2083,14 @@ static IFSelect_ReturnStatus fun_editlist if (edt.IsNull()) edt = GetCasted(IFSelect_Editor,WS->NamedItem(arg1)); if (edt.IsNull()) return IFSelect_RetVoid; - sout<<"Editor, Label : "<Label()<Label()<<'\n'; + sout<<'\n'<<" -- Names (short - complete) + Labels of Values"<<'\n'; edt->PrintNames(sout); - sout<PrintDefs (sout); if (!edf.IsNull()) { edf->PrintDefs(sout); - sout<NbWords(); Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 3) { sout<<"Give the name of an EditForm + name of Value [+ newvalue or . to nullify]"<Arg(1); const Standard_CString arg2 = pilot->Arg(2); Handle(IFSelect_WorkSession) WS = pilot->Session(); DeclareAndCast(IFSelect_EditForm,edf,WS->NamedItem(arg1)); if (edf.IsNull()) - { sout<<"Not an EditForm : "<NameNumber (arg2); - if (num == 0) sout<<"Unknown Value Name : "<Editor()->IsList(num); @@ -2134,19 +2134,19 @@ static IFSelect_ReturnStatus fun_editvalue if (islist) { listr = edf->EditedList(num); - if (listr.IsNull()) sout<<"(NULL LIST)"<Length(); - sout<<"(List : "<Value(ilist); - sout<<" ["<ToCString())<ToCString())<<'\n'; } } - if (argc < 4) sout<<"To Edit, options by editval edit-form value-name ?"<EditedValue (num); - sout<<(str.IsNull() ? "(NULL)" : str->ToCString())<ToCString())<<'\n'; } if (argc < 4) return IFSelect_RetVoid; @@ -2157,10 +2157,10 @@ static IFSelect_ReturnStatus fun_editvalue const Standard_CString argval = pilot->Arg(numarg); if (islist) { if (argval[0] == '?') { - sout<<"To Edit, options"<CommandPart(numarg+1)),numset); } if (stated) stated = edf->ModifyList (num,listed,Standard_True); - if (stated) sout<<"List Edition done"<CommandPart(numarg)); if (edf->Modify (num,str,Standard_True)) { - sout<<"Now set to "<<(str.IsNull() ? "(NULL)" : str->ToCString())<ToCString())<<'\n'; } else { - sout<<"Modify not done"<NbWords(); Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Give the name of an EditForm [+ name of Value else all]"<Arg(1); const Standard_CString arg2 = pilot->Arg(2); Handle(IFSelect_WorkSession) WS = pilot->Session(); DeclareAndCast(IFSelect_EditForm,edf,WS->NamedItem(arg1)); if (edf.IsNull()) - { sout<<"Not an EditForm : "<ClearEdit(); sout<<"All Modifications Cleared"<ClearEdit(); sout<<"All Modifications Cleared"<<'\n'; } else { Standard_Integer num = edf->NameNumber (arg2); - if (num == 0) sout<<"Unknown Value Name : "<IsModified(num)) - { sout<<"Value "<ClearEdit (num); - sout<<"Modification on Value "<NbWords(); Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Give the name of an EditForm [+ option keep to re-apply edited values]"<Arg(1); const Standard_CString arg2 = pilot->Arg(2); Handle(IFSelect_WorkSession) WS = pilot->Session(); DeclareAndCast(IFSelect_EditForm,edf,WS->NamedItem(arg1)); if (edf.IsNull()) - { sout<<"Not an EditForm : "<Entity(); Handle(Interface_InterfaceModel) model = edf->Model(); if (!model.IsNull()) { - if (ent.IsNull()) sout<<"Applying modifications on loaded model"<PrintLabel (ent, sout); } } - else sout<<"Applying modifications"<ApplyData (edf->Entity(),edf->Model())) { - sout<<"Modifications could not be applied"< 2 && arg2[0] == 'k') stat = Standard_False; if (stat) { edf->ClearEdit(); - sout<<"Edited values are cleared"<NbWords(); Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Give the name of an EditForm [+ Entity-Ident]"<Arg(1); const Standard_CString arg2 = pilot->Arg(2); Handle(IFSelect_WorkSession) WS = pilot->Session(); DeclareAndCast(IFSelect_EditForm,edf,WS->NamedItem(arg1)); if (edf.IsNull()) - { sout<<"Not an EditForm : "<Number (arg2)); Standard_Boolean stat = Standard_False; if (argc < 3) { - sout<<"EditForm "<LoadModel(WS->Model()); } else if (num <= 0) { - sout<<"Not an entity ident : "<LoadData (WS->StartingEntity(num),WS->Model()); } if (!stat) { - sout<<"Loading not done"<NamedItem( &(nam.ToCString())[paro])); if (sg.IsNull()) { - sout<<"DispPerSignature "<SetSignCounter (new IFSelect_SignCounter(sg)); return ds; } - sout<<"Dispatch : "< 0) { @@ -180,7 +180,7 @@ IFSelect_ModelCopier::IFSelect_ModelCopier () { } if (!res) { char mess[100]; sprintf(mess,"Split Send (WriteFile) abandon on file n0.%d",i); checks.CCheck(0)->AddFail (mess); - Message::SendInfo() << " ** Sending File n0."<Init(0); for (eval.Evaluate(); eval.More(); eval.Next()) { @@ -237,7 +237,7 @@ IFSelect_ModelCopier::IFSelect_ModelCopier () { } if (!res) { char mess[100]; sprintf(mess,"Split Send (WriteFile) abandon on file n0.%d",i); checks.CCheck(0)->AddFail (mess); - Message::SendInfo() << " ** Sending File "<NewEmptyModel(); diff --git a/src/IFSelect/IFSelect_SessionFile.cxx b/src/IFSelect/IFSelect_SessionFile.cxx index 0f60292faf..5071086574 100644 --- a/src/IFSelect/IFSelect_SessionFile.cxx +++ b/src/IFSelect/IFSelect_SessionFile.cxx @@ -136,12 +136,12 @@ static int deja = 0; Message_Messenger::StreamBuffer sout = Message::SendInfo(); SplitLine (headerline); - if (theline.Length() != 4) { sout<<"File Form Incorrect"<DynamicType(); if (!theline.Value(1).IsEqual("!XSTEP") || !theline.Value(2).IsEqual("SESSION") || !theline.Value(4).IsEqual(sesstype->Name()) ) - { sout<<"Lineno."<DynamicType(); if (!theline.Value(1).IsEqual("!XSTEP") || !theline.Value(2).IsEqual("SESSION") || !theline.Value(4).IsEqual(sesstype->Name()) ) - { sout<<"Lineno."<SetErrorHandle(Standard_False); else if (theline.Value(2).IsEqual("1")) thesess->SetErrorHandle(Standard_True); - else { sout<<"Lineno."<SetValue ( atoi(theline.Value(2).ToCString()) ); AddItem (par); @@ -470,7 +470,7 @@ static int deja = 0; if (!ReadLine()) return 1; if (theline.Value(1).Value(1) == '!') break; // liste suivante if (theline.Length() != 2) - { sout<<"Lineno."<SetDirect( (direct > 0) ); } DeclareAndCast(IFSelect_SelectAnyList,sli,item); if (!sli.IsNull()) { - if (numlist == 0) sout<<"Lineno."<SetRange(low,up); } AddItem(item); @@ -531,29 +531,29 @@ static int deja = 0; if (!ReadLine()) return 1; if (theline.Value(1).Value(1) == '!') break; // liste suivante if (theline.Length() < 3) - { sout<<"Lineno."< 1) - sout<<"Lineno."<SetInput(source); } DeclareAndCast(IFSelect_SelectDeduct,sdt,sel); if (!sdt.IsNull()) { if (nbs > 1) - sout<<"Lineno."<SetInput(GetCasted(IFSelect_Selection,ItemValue(3))); } DeclareAndCast(IFSelect_SelectControl,sct,sel); if (!sct.IsNull()) { if (nbs != 2) - sout<<"Lineno."<SetMainInput (GetCasted(IFSelect_Selection,ItemValue(3))); sct->SetSecondInput (GetCasted(IFSelect_Selection,ItemValue(4))); } @@ -570,13 +570,13 @@ static int deja = 0; if (!ReadLine()) return 1; if (theline.Value(1).Value(1) == '!') break; // liste suivante if (theline.Length() < 2) - { sout<<"Lineno."<SetItemSelection(disp,input); } @@ -627,7 +627,7 @@ static int deja = 0; if (!ReadLine()) return 1; if (theline.Value(1).Value(1) == '!') break; // liste suivante if (theline.Length() != 2) - { sout<<"Lineno."<SetFileRoot (disp,theline.Value(2).ToCString()); } @@ -648,12 +648,12 @@ static int deja = 0; if (!ReadLine()) return 1; if (theline.Value(1).Value(1) == '!') break; // liste suivante if (theline.Length() < 3) - { sout<<"Lineno."<SetItemSelection (modif,input); if (!disp.IsNull()) thesess->SetAppliedModifier (modif,disp); else thesess->SetAppliedModifier (modif,thesess->ShareOut()); @@ -670,7 +670,7 @@ static int deja = 0; if ( theline.Length() != 2 || !theline.Value(1).IsEqual("!XSTEP") || !theline.Value(2).IsEqual("END")) - { sout<<"End of File Incorrect, lineno"<ReadOwn(*this,type,item)) break; dumper = dumper->Next(); } - if (dumper.IsNull()) sout<<" -- Lineno."< echec } @@ -745,7 +745,7 @@ static int deja = 0; else id = thesess->AddNamedItem(name.ToCString(),item,active); } else sout<<"Lineno."<Value(id); if (filenum == 0) { if (!par.IsNull()) sout << "Lineno " << thenl << " -- Unknown Item : " - << " Type:" << par->DynamicType()->Name() << std::endl; //sout<DynamicType()->Name() << '\n'; //sout<Item(id); diff --git a/src/IFSelect/IFSelect_SessionPilot.cxx b/src/IFSelect/IFSelect_SessionPilot.cxx index acf782e10e..e622437fb2 100644 --- a/src/IFSelect/IFSelect_SessionPilot.cxx +++ b/src/IFSelect/IFSelect_SessionPilot.cxx @@ -92,8 +92,8 @@ IFSelect_SessionPilot::IFSelect_SessionPilot (const Standard_CString prompt) (const TCollection_AsciiString& command) { Standard_Integer lc = command.Length(); - if (lc > 200) std::cout<<" Commande TRES LONGUE : "< 200) std::cout<<" Commande TRES LONGUE : "< MAXCARS) { std::cout<<"Arg."< "< MAXCARS) { std::cout<<"Arg."< "< 0) { @@ -244,8 +244,8 @@ IFSelect_SessionPilot::IFSelect_SessionPilot (const Standard_CString prompt) if (file != NULL && file[0] != '\0') { fic = OSD_OpenFile (file,"r"); if (fic) lefic = 1; - else { std::cout<<" ... Script File "<RemoveItem(theobjrec); //// depannage ? Standard_Integer addws = thesession->AddItem(theobjrec); - if (addws == 0) { std::cout<<"Could not add item to session, sorry"<GiveList (CommandPart(numword)); if (list.IsNull()) { - std::cout<<"Nothing selected from : "<AddWithGraph (list,thesession->Graph()); @@ -349,7 +349,7 @@ IFSelect_SessionPilot::IFSelect_SessionPilot (const Standard_CString prompt) (const Standard_CString val) const { Standard_Integer num = thesession->NumberFromLabel (val); - if (num < 0) std::cout<<" Label:"<"<<-num<<" ent.s, refus"<"<<-num<<" ent.s, refus"<<'\n'; return num; } @@ -372,7 +372,7 @@ IFSelect_SessionPilot::IFSelect_SessionPilot (const Standard_CString prompt) switch (number) { case -1 : // **** HELP-XSNEW modhelp = 1; - std::cout<<" -- Commands candidate for xsnew --"<Length(); - std::cout << " -- Liste des Commands Disponibles --"<Value(i); Standard_Integer loncom = uncom.Length(); nbcom ++; - if (nbcom > MAXCOMPERLINE) { std::cout< MAXCOMPERLINE) { std::cout<<'\n'; nbcom = 1; } std::cout<<" "< 0) std::cout< 0) std::cout<<'\n'; std::cout<<"\nhelp * liste toutes les commandes avec un help sur chacune\n" <<"help liste la ou les commande debutant par " - <<" avec un help sur chacune"<Value(i).ToCString(),num,actor)) { if (IFSelect_Activator::Mode (list->Value(i).ToCString()) == 1) std::cout<<"[xsnew name] "; - std::cout << list->Value(i) << " : " << actor->Help(num) << std::endl; + std::cout << list->Value(i) << " : " << actor->Help(num) << '\n'; } } if (nb == 0 && thenbwords > 1) std::cout<<" Command "<CommandLine()<CommandLine()<<'\n'; std::cout<<"Nb Words : " << argc-2 << " :\n"; for (Standard_Integer i = 2; i < argc; i ++) { - std::cout << " Word." << i-1 << " : " << session->Word(i) <Word(i) <<'\n'; } break; } case 'c' : session->Clear(); break; // **** command clear case 'f' : { - if (argc < 3) { std::cout<<"Donner nom de fichier"<NbCommands(); - if (nb == 0) { std::cout<<"Aucune commande enregistree"<Command(i)<Command(i)<<'\n'; break; } case 'l' : { // **** command list - if (session->RecordMode()) std::cout<<" -- Record Mode Actif"<RecordMode()) std::cout<<" -- Record Mode Actif"<<'\n'; + else std::cout<<" -- Record Mode Inactif"<<'\n'; Standard_Integer nb = session->NbCommands(); - std::cout << "Nb Commandes enregistrees : " << nb << " :"<Command(i)<Command(i)<<'\n'; } break; } case 'r' : { // **** command record Standard_Boolean mode = session->RecordMode(); - if (mode) std::cout << " -- Record Mode a present Inactif" <SetRecordMode(!mode); break; } - default : std::cout << "Option de controle de commande non comprise"<ReadScript (TCollection_AsciiString(session->Word(1)).ToCString()); // On recopie la string parce que Word(1) change tout le temps ! @@ -478,8 +478,8 @@ IFSelect_SessionPilot::IFSelect_SessionPilot (const Standard_CString prompt) case 5 : { // **** XSTEP if (argc < 2) { - std::cout<<"xstep : prefixe neutre pour toute commande xstep-draw"<NameIdent(thewords(0).ToCString()) > 0) ////// { std::cout<<"Command with name:"<AddNamedItem(name.ToCString(),theobjrec); theobjrec.Nullify(); - if (addws == 0) { std::cout<<"Could not add named item:"<::Iterator iter(thedicount); - S << " Count "<ToCString()<<"\n ----- -----------"<ToCString()<<"\n ----- -----------"<<'\n'; for (; iter.More(); iter.Next()) { Standard_Integer val = iter.Value(); - S << Interface_MSG::Blanks(val,6) << val <<" "< 0) S << thename->ToCString()<< " Nul : " << thenbnuls < 0) S << thename->ToCString()<< " Nul : " << thenbnuls <<'\n'; + S << " Nb Total:"<::Iterator iter(thediclist); for (; iter.More(); iter.Next()) { DeclareAndCast(TColStd_HSequenceOfTransient,list,iter.Value()); - S<Length(); S<<" - Nb: "< 5 && mod == IFSelect_ShortByItem) nc = 5; @@ -194,18 +194,18 @@ IFSelect_SignatureList::IFSelect_SignatureList { S<<":"; model->PrintLabel(list->Value(i), S); } } if (nc < nb) S<<" .. etc"; - S<::Iterator iter(thedicount); - S << " Summary "<ToCString()<<"\n ----- -----------"<ToCString()<<"\n ----- -----------"<<'\n'; Standard_Integer nbtot = 0, nbsign = 0, maxent = 0, nbval = 0, nbve = 0, minval = 0, maxval = 0, totval = 0; for (; iter.More(); iter.Next()) { Standard_Integer nbent = iter.Value(); @@ -231,18 +231,18 @@ IFSelect_SignatureList::IFSelect_SignatureList nbve += nbent; totval += (val*nbent); } - S << " Nb Total:"< 0) { - S<<" Summary on Integer Values"<AddFail ("Exception Raised -> Abandon"); } errhand = theerrhand; @@ -2051,7 +2051,7 @@ void IFSelect_WorkSession::EvaluateFile () checks = thecopier->Copy (R,thelibrary,theprotocol); if (!checks.IsEmpty(Standard_False)) { Message_Messenger::StreamBuffer sout = Message::SendInfo(); - sout<<" ** EvaluateFile has produced Check Messages : **"<SetRemaining (thegraph->CGraph()); @@ -2143,7 +2143,7 @@ Standard_Boolean IFSelect_WorkSession::SendSplit () Message_Messenger::StreamBuffer sout = Message::SendInfo(); sout<<" **** Interruption SendSplit par Exception : ****\n"; sout<AddFail ("Exception Raised -> Abandon"); } errhand = theerrhand; @@ -2158,7 +2158,7 @@ Standard_Boolean IFSelect_WorkSession::SendSplit () } if (!IsLoaded()) { Message_Messenger::StreamBuffer sout = Message::SendInfo(); - sout<< " *** Data for SendSplit not available ***"<AddFail("Data not available"); thecheckrun = checks; return Standard_False; @@ -2199,10 +2199,10 @@ Standard_Boolean IFSelect_WorkSession::SendSplit () filepart = FileExtension(); if (!filepart.IsNull()) filnam.AssignCat (filepart->ToCString()); IFSelect_ReturnStatus stat = SendSelected (filnam.ToCString(),sp); - if (stat != IFSelect_RetDone) std::cout<<"File "<CopiedRemaining (thegraph->Graph(),thelibrary,TC,newmod); if (newmod.IsNull()) { - sout<<" No Remaining Data recorded"<SetRemaining (thegraph->CGraph()); return Standard_False; } else { @@ -2310,17 +2310,17 @@ Standard_Boolean IFSelect_WorkSession::SetRemaining for (Standard_Integer i = 1; i <= nb; i ++) { if (thegraph->Graph().Status(i) >= 0) ne ++; } if (ne == 0) { - sout<<" - All entities are remaining, none yet sent"<AddFail ("Exception Raised -> Abandon"); thecheckrun = checks; @@ -2416,7 +2416,7 @@ IFSelect_ReturnStatus IFSelect_WorkSession::SendSelected Message_Messenger::StreamBuffer sout = Message::SendInfo(); sout<<" **** Interruption SendSelected par Exception : ****\n"; sout<AddFail ("Exception Raised -> Abandon"); errhand = theerrhand; thecheckrun = checks; @@ -2861,30 +2861,30 @@ void IFSelect_WorkSession::TraceStatics { Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (use > 0) { - if (mode == 0) sout<<"******************************************"< 0) if (use == 5) { TraceStatics (-2,mode); - if (mode == 0) sout<Prefix(); - if (!str.IsNull()) sout << "Prefix : "<ToCString()<ToCString()<<'\n'; + else sout << "Prefix not Defined" << '\n'; str = theshareout->DefaultRootName(); - if (!str.IsNull()) sout << "Default Root : "<ToCString()<ToCString()<<'\n'; + else sout << "Default Root not Defined" << '\n'; str = theshareout->Extension(); - if (!str.IsNull()) sout << "Extension : "<ToCString()<ToCString()<<'\n'; + else sout << "Extension not defined" << '\n'; } } @@ -2911,7 +2911,7 @@ void IFSelect_WorkSession::TraceStatics // Fin if (use > 0) { - if (mode == 0) sout<<"******************************************"<Prefix(); - if (!str.IsNull()) sout << "Prefix : " << str->ToCString() << std::endl; - else sout << "Prefix not Defined" << std::endl; + if (!str.IsNull()) sout << "Prefix : " << str->ToCString() << '\n'; + else sout << "Prefix not Defined" << '\n'; str = theshareout->DefaultRootName(); - if (!str.IsNull()) sout << "Default Root : " << str->ToCString() << std::endl; - else sout << "Default Root not Defined" << std::endl; + if (!str.IsNull()) sout << "Default Root : " << str->ToCString() << '\n'; + else sout << "Default Root not Defined" << '\n'; str = theshareout->Extension(); - if (!str.IsNull()) sout << "Extension : " << str->ToCString() << std::endl; - else sout << "Extension not defined" << std::endl; + if (!str.IsNull()) sout << "Extension : " << str->ToCString() << '\n'; + else sout << "Extension not defined" << '\n'; Standard_Integer lr = theshareout->LastRun(); Standard_Integer nb = theshareout->NbDispatches(); - sout << "Nb Dispatches : " << nb <<" (Last Run : " << lr << ") : "<Dispatch(i); sout << "Dispatch n0 " << i; if (HasName(disp)) sout << " Name:"<< Name(disp)->ToCString(); - sout << " Label:" << disp->Label() << std::endl; + sout << " Label:" << disp->Label() << '\n'; Handle(IFSelect_Selection) sel = disp->FinalSelection(); - if (sel.IsNull()) sout << " No Final Selection Defined" << std::endl; + if (sel.IsNull()) sout << " No Final Selection Defined" << '\n'; else if (HasName(sel)) sout << " Final Selection : Name:" - << Name(sel)->ToCString() << " Label:" << sel->Label() << std::endl; - else sout << " Final Selection : " << sel->Label() << std::endl; + << Name(sel)->ToCString() << " Label:" << sel->Label() << '\n'; + else sout << " Final Selection : " << sel->Label() << '\n'; if (disp->HasRootName()) - sout<<" File Root Name : "<RootName()->ToCString()<RootName()->ToCString()<<'\n'; + else sout<<" No specific file root name (see Default Root)"<<'\n'; } Standard_Integer nbm = theshareout->NbModifiers(Standard_True); if (nbm > 0) sout<< - " *** "<NbModifiers(Standard_False); if (nbf > 0) sout<< - " *** "<ToCString()<<" - "; else sout<<" - (no name) - "; - sout<DynamicType()->Name()<ToCString()<DynamicType()->Name()<<'\n'<<" "<ToCString()<<'\n'; } } @@ -3004,13 +3004,13 @@ void IFSelect_WorkSession::ListFinalModifiers Standard_Integer nb = theshareout->NbModifiers(formodel); sout<< " ********** Modifiers in Session "; sout<<(formodel ? "(For Model)" : "(For File)"); - sout<<": "<GeneralModifier(formodel,i); if (!modif.IsNull()) sout<<"Modifier n0."<Label(); if (HasName(modif)) sout << " Named as : " << Name(modif)->ToCString(); - sout<ToCString(); - sout <<" **********"<Label() << " . Input(s) : "<< std::endl; + sout <<" **********"<<'\n'; + sout<< "Label : " << sel->Label() << " . Input(s) : "<< '\n'; Standard_Integer nb = 0; IFSelect_SelectionIterator iter; sel->FillIterator(iter); for (; iter.More(); iter.Next()) { nb ++; const Handle(IFSelect_Selection)& newsel = iter.Value(); - sout<<" -- "<Label()<Label()<<'\n'; } - sout << " Nb Inputs:"< 0) - S << " ******** Loaded File : "<DumpHeader (S); S <DumpHeader (S); S <<'\n'; } Standard_Integer nbent = myModel->NbEntities(); @@ -3314,7 +3314,7 @@ void IFSelect_WorkSession::DumpModel } S << " *****************************************************************\n" << " ******** Model : "< what could be determined is listed"< what could be determined is listed"<<'\n'; } } else if (level == 3) C = CT.CheckList(); @@ -3359,11 +3359,11 @@ void IFSelect_WorkSession::DumpModel Message_Messenger::StreamBuffer sout = Message::SendInfo(); sout<<" **** Interruption DumpModel par Exception : ****\n"; sout<Number(ent); - if (num == 0) { S <<" *** Entity to Dump not in the Model ***"<DumpEntity (myModel,theprotocol,ent,S,level); } @@ -3431,38 +3431,38 @@ void IFSelect_WorkSession::PrintEntityStatus { Standard_Integer i,nb; Standard_Integer num = StartingNumber(ent); - if (num == 0) { std::cout<<" -- PrintEntityStatus : unknown"<Print (ent, S); Handle(TCollection_HAsciiString) hname = EntityName(ent); if (!hname.IsNull() && hname->Length() > 0) S <<" Name:"<ToCString(); - S <DynamicType()->Name()<Value (ent,myModel)<DynamicType()->Name()<<'\n'; + else S <<" Type:"<Value (ent,myModel)<<'\n'; S <<" Category : " <Length(); if (nb == 0) S <<" Root"; else S <<" Super-entities:"<Print(list->Value(i), S); } - S <Length(); if (nb == 0) S <<" No sub-entity"; else S <<" Sub-entities:"<Print(list->Value(i), S); } - S <Label()<Label()<<'\n'; } @@ -3563,7 +3563,7 @@ void IFSelect_WorkSession::EvaluateDispatch catch (Standard_Failure const& anException) { sout<<" **** Interruption EvaluateDispatch par Exception **** Intitule\n"; sout<NbDispatches() < numdisp || numdisp <= 0) - { sout<<"Dispatch : Unknown"<FinalSelection().IsNull()) - { sout<<"Dispatch : No Final Selection"<Label()<Label()<<'\n'; IFSelect_ShareOutResult eval(disp,thegraph->Graph()); eval.Evaluate(); @@ -3585,34 +3585,34 @@ void IFSelect_WorkSession::EvaluateDispatch eval.Packets (mode ? Standard_True : Standard_False); Standard_Integer nbpack = evres->NbPackets(); - sout<<"Nb Packets produced : "<Entities(numpack), (mode ? 2 : -1), sout); } //// Interface_EntityIterator iterem = disp->Remainder(thegraph->Graph()); if (mode == 0) return; if (mode == 1 || mode == 3) { - sout<NbDuplicated(0,Standard_False) == 0) - sout<<" **** All the Model is taken into account ****"<Duplicated(0,Standard_False), 2, sout); } } if (mode >= 2) { sout<<" **** Entites in more than one packet ****"; Standard_Integer max = evres->HighestDuplicationCount(); - if (max < 2) sout<<" : There are none"<NbDuplicated(newcount,Standard_False) == 0) continue; - sout<<" **** Entities put in "<Duplicated(newcount,Standard_False), 2, sout); } } @@ -3641,52 +3641,52 @@ void IFSelect_WorkSession::EvaluateComplete catch (Standard_Failure const& anException) { sout<<" **** Interruption EvaluateComplete par Exception : ****\n"; sout<Graph()); eval.Evaluate(); sout<<"\n******** Evaluation ShareOutResult (Complete) ********\n"; - sout<<" **** List of Packets **** Count : "<NbPackets(); - sout<<"Nb Packets produced : "<Entities(numpack), (mode ? 2: -1), sout); } if (mode == 0) return; if (mode == 1 || mode == 3) { - sout<NbDuplicated(0,Standard_False) == 0) - sout<<" **** All the Model is taken into account ****"<Duplicated(0,Standard_False), 2, sout); } } if (mode >= 2) { - sout<<" **** Entites in more than one packet ****"<HighestDuplicationCount(); - if (max < 2) sout<<" : There are none"<NbDuplicated(newcount,Standard_False) == 0) continue; - sout<<" **** Entities put in "<Duplicated(newcount,Standard_False), 2, sout); } } @@ -3707,9 +3707,9 @@ void IFSelect_WorkSession::ListEntities { int titre = 0; Standard_Integer mode = (mmode < 0 ? -mmode : mmode); - if (mmode >= 0) sout << " List of " << iter.NbEntities() << " Entities :"<= 0) sout << " List of " << iter.NbEntities() << " Entities :"<<'\n'; if (!IsLoaded()) - { sout<< " *** Data for List not available ***"<Graph()); try { @@ -3717,9 +3717,9 @@ void IFSelect_WorkSession::ListEntities int newcount = -1; int mods = 0; int cnt = 0; for (iter.Start(); iter.More(); iter.Next()) { if (!titre && mode == 1) sout - << "Number/Id. Category Validity Type\n----------- ----...."< 0) sout<<" "<TypeName (ent, Standard_False)<TypeName (ent, Standard_False)<<'\n'; } else if (mode == 2) { newcount ++; if (newcount > 0) sout<<","; sout<= 10) { sout << std::endl<<"["<= 10) { sout << '\n'<<"["< 0) sout << " "; myModel->Print (ent, sout, 0); if (!tool.IsShared(ent)) { if(mods == 0) sout<<"("; sout<<"R"; mods++; } @@ -3750,12 +3750,12 @@ void IFSelect_WorkSession::ListEntities if (mods) { sout<<")"; newcount ++; } } } - if (mode == 0) sout<NbPropertyValues() << std::endl; + S << "Number of property values : " << ent->NbPropertyValues() << '\n'; S << "Drill diameter size :" << ent->DrillDiaSize() << " "; - S << "Finish diameter size : " << ent->FinishDiaSize() << std::endl; + S << "Finish diameter size : " << ent->FinishDiaSize() << '\n'; S << "Plating indication flag : "; if (!ent->IsPlating()) S << "NO" << " - "; else S << "YES - "; S << "Lower Numbered Layer : " << ent->NbLowerLayer() << " "; - S << "Higher Numbered Layer : " << ent->NbHigherLayer() << std::endl; + S << "Higher Numbered Layer : " << ent->NbHigherLayer() << '\n'; } diff --git a/src/IGESAppli/IGESAppli_ToolFiniteElement.cxx b/src/IGESAppli/IGESAppli_ToolFiniteElement.cxx index cc1477807c..170b330ad2 100644 --- a/src/IGESAppli/IGESAppli_ToolFiniteElement.cxx +++ b/src/IGESAppli/IGESAppli_ToolFiniteElement.cxx @@ -132,5 +132,5 @@ void IGESAppli_ToolFiniteElement::OwnDump S << "Nodes : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbNodes(),ent->Node); S << "\nElement Name : " << ent->Name()->String(); - S << std::endl; + S << '\n'; } diff --git a/src/IGESAppli/IGESAppli_ToolFlow.cxx b/src/IGESAppli/IGESAppli_ToolFlow.cxx index 783a2f8968..bfba455d78 100644 --- a/src/IGESAppli/IGESAppli_ToolFlow.cxx +++ b/src/IGESAppli/IGESAppli_ToolFlow.cxx @@ -322,6 +322,6 @@ void IGESAppli_ToolFlow::OwnDump S << "\nContinuation Flow Associativities : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbContFlowAssociativities(), ent->ContFlowAssociativity); - S << std::endl; + S << '\n'; } diff --git a/src/IGESAppli/IGESAppli_ToolLineWidening.cxx b/src/IGESAppli/IGESAppli_ToolLineWidening.cxx index a1bbd73f40..4d98304012 100644 --- a/src/IGESAppli/IGESAppli_ToolLineWidening.cxx +++ b/src/IGESAppli/IGESAppli_ToolLineWidening.cxx @@ -161,8 +161,8 @@ void IGESAppli_ToolLineWidening::OwnDump S << "incorrect value\n"; if (ent->ExtensionFlag() == 2) - S << "Extension Value : " << ent->ExtensionValue() << std::endl; + S << "Extension Value : " << ent->ExtensionValue() << '\n'; else - S << "No Extension Value (Extension Flag != 2)" << std::endl; + S << "No Extension Value (Extension Flag != 2)" << '\n'; } diff --git a/src/IGESAppli/IGESAppli_ToolNodalConstraint.cxx b/src/IGESAppli/IGESAppli_ToolNodalConstraint.cxx index 45f7b52cc7..d357908ee4 100644 --- a/src/IGESAppli/IGESAppli_ToolNodalConstraint.cxx +++ b/src/IGESAppli/IGESAppli_ToolNodalConstraint.cxx @@ -138,5 +138,5 @@ void IGESAppli_ToolNodalConstraint::OwnDump S << "\n"; S << "Tabular Data Properties : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbCases(),ent->TabularData); - S << std::endl; + S << '\n'; } diff --git a/src/IGESAppli/IGESAppli_ToolNodalDisplAndRot.cxx b/src/IGESAppli/IGESAppli_ToolNodalDisplAndRot.cxx index 2528bb9b26..c9075a1540 100644 --- a/src/IGESAppli/IGESAppli_ToolNodalDisplAndRot.cxx +++ b/src/IGESAppli/IGESAppli_ToolNodalDisplAndRot.cxx @@ -231,7 +231,7 @@ void IGESAppli_ToolNodalDisplAndRot::OwnDump // IGESData_DumpListXYZL(S,-level,1,nbcases,ent->TranslationParameter,loca); S << "Rotational Parameters : "; // IGESData_DumpListXYZL(S,-level,1,nbcases,ent->RotationalParameter,loca); - S << " TO BE DONE" << std::endl; + S << " TO BE DONE" << '\n'; break; case 5: case 6: { @@ -239,7 +239,7 @@ void IGESAppli_ToolNodalDisplAndRot::OwnDump { S << "[" << i << "]: "; dumper.Dump (ent->Note(i),S, 1); - S << std::endl; + S << '\n'; } S << "Nodes :\n"; S << "Node Identifiers :\n"; @@ -273,5 +273,5 @@ void IGESAppli_ToolNodalDisplAndRot::OwnDump break; default: break; } - S << std::endl; + S << '\n'; } diff --git a/src/IGESAppli/IGESAppli_ToolNode.cxx b/src/IGESAppli/IGESAppli_ToolNode.cxx index 841ab972a9..cb855bd63a 100644 --- a/src/IGESAppli/IGESAppli_ToolNode.cxx +++ b/src/IGESAppli/IGESAppli_ToolNode.cxx @@ -118,5 +118,5 @@ void IGESAppli_ToolNode::OwnDump dumper.Dump(ent->System(),S, level); else S << "Global Cartesian Coordinate System (default)"; - S << std::endl; + S << '\n'; } diff --git a/src/IGESAppli/IGESAppli_ToolPWBArtworkStackup.cxx b/src/IGESAppli/IGESAppli_ToolPWBArtworkStackup.cxx index e8cc239b82..fe02d892ae 100644 --- a/src/IGESAppli/IGESAppli_ToolPWBArtworkStackup.cxx +++ b/src/IGESAppli/IGESAppli_ToolPWBArtworkStackup.cxx @@ -119,5 +119,5 @@ void IGESAppli_ToolPWBArtworkStackup::OwnDump S << "\n"; S << "Level Numbers : "; IGESData_DumpVals(S,level,1, ent->NbLevelNumbers(),ent->LevelNumber); - S << std::endl; + S << '\n'; } diff --git a/src/IGESAppli/IGESAppli_ToolPWBDrilledHole.cxx b/src/IGESAppli/IGESAppli_ToolPWBDrilledHole.cxx index ca35badc5a..46d81f1413 100644 --- a/src/IGESAppli/IGESAppli_ToolPWBDrilledHole.cxx +++ b/src/IGESAppli/IGESAppli_ToolPWBDrilledHole.cxx @@ -121,5 +121,5 @@ void IGESAppli_ToolPWBDrilledHole::OwnDump << "Number of property values : " << ent->NbPropertyValues() << "\n" << "Drill Diameter Size : " << ent->DrillDiameterSize() << "\n" << "Finish Diameter Size : " << ent->FinishDiameterSize() << "\n" - << "Drilled Hole Function Code : " << ent->FunctionCode() << std::endl; + << "Drilled Hole Function Code : " << ent->FunctionCode() << '\n'; } diff --git a/src/IGESAppli/IGESAppli_ToolPartNumber.cxx b/src/IGESAppli/IGESAppli_ToolPartNumber.cxx index e5a1536d82..2b2d2f1eb1 100644 --- a/src/IGESAppli/IGESAppli_ToolPartNumber.cxx +++ b/src/IGESAppli/IGESAppli_ToolPartNumber.cxx @@ -142,5 +142,5 @@ void IGESAppli_ToolPartNumber::OwnDump S << "\n"; S << "Internal Number or Name : "; IGESData_DumpString(S,ent->InternalNumber()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESAppli/IGESAppli_ToolPinNumber.cxx b/src/IGESAppli/IGESAppli_ToolPinNumber.cxx index 8912ed7270..3b449b4d7a 100644 --- a/src/IGESAppli/IGESAppli_ToolPinNumber.cxx +++ b/src/IGESAppli/IGESAppli_ToolPinNumber.cxx @@ -118,5 +118,5 @@ void IGESAppli_ToolPinNumber::OwnDump S << "Number of Property Values : " << ent->NbPropertyValues() << "\n"; S << "PinNumber : "; IGESData_DumpString(S,ent->PinNumberVal()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESAppli/IGESAppli_ToolPipingFlow.cxx b/src/IGESAppli/IGESAppli_ToolPipingFlow.cxx index a4e7cd01f2..41b3b5f090 100644 --- a/src/IGESAppli/IGESAppli_ToolPipingFlow.cxx +++ b/src/IGESAppli/IGESAppli_ToolPipingFlow.cxx @@ -302,6 +302,6 @@ void IGESAppli_ToolPipingFlow::OwnDump S << "Continuation Flow Associativities : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbContFlowAssociativities(), ent->ContFlowAssociativity); - S << std::endl; + S << '\n'; } diff --git a/src/IGESAppli/IGESAppli_ToolReferenceDesignator.cxx b/src/IGESAppli/IGESAppli_ToolReferenceDesignator.cxx index 789a313217..2180901503 100644 --- a/src/IGESAppli/IGESAppli_ToolReferenceDesignator.cxx +++ b/src/IGESAppli/IGESAppli_ToolReferenceDesignator.cxx @@ -123,5 +123,5 @@ void IGESAppli_ToolReferenceDesignator::OwnDump S << "Number of Property Values : " << ent->NbPropertyValues() << "\n"; S << "ReferenceDesignator : "; IGESData_DumpString(S,ent->RefDesignatorText()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESAppli/IGESAppli_ToolRegionRestriction.cxx b/src/IGESAppli/IGESAppli_ToolRegionRestriction.cxx index e974c4563b..8f2ade6fc6 100644 --- a/src/IGESAppli/IGESAppli_ToolRegionRestriction.cxx +++ b/src/IGESAppli/IGESAppli_ToolRegionRestriction.cxx @@ -132,5 +132,5 @@ void IGESAppli_ToolRegionRestriction::OwnDump << "Electrical components restriction : " << ent->ElectricalComponentRestriction() << "\n" << "Electrical circuitary restriction : " - << ent->ElectricalCktRestriction() << std::endl; + << ent->ElectricalCktRestriction() << '\n'; } diff --git a/src/IGESBasic/IGESBasic_ToolAssocGroupType.cxx b/src/IGESBasic/IGESBasic_ToolAssocGroupType.cxx index 9c79ca3d88..de345949b9 100644 --- a/src/IGESBasic/IGESBasic_ToolAssocGroupType.cxx +++ b/src/IGESBasic/IGESBasic_ToolAssocGroupType.cxx @@ -115,5 +115,5 @@ void IGESBasic_ToolAssocGroupType::OwnDump << "Type of attached associativity : " << ent->AssocType() << "\n" << "Name of attached associativity : "; IGESData_DumpString(S,ent->Name()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESBasic/IGESBasic_ToolExternalRefFile.cxx b/src/IGESBasic/IGESBasic_ToolExternalRefFile.cxx index 5a1483cfd7..300deb3570 100644 --- a/src/IGESBasic/IGESBasic_ToolExternalRefFile.cxx +++ b/src/IGESBasic/IGESBasic_ToolExternalRefFile.cxx @@ -93,5 +93,5 @@ void IGESBasic_ToolExternalRefFile::OwnDump S << "IGESBasic_ExternalRefFile\n" << "External Reference File Identifier : "; IGESData_DumpString(S,ent->FileId()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESBasic/IGESBasic_ToolExternalRefFileIndex.cxx b/src/IGESBasic/IGESBasic_ToolExternalRefFileIndex.cxx index 88478bf2c6..93be454b34 100644 --- a/src/IGESBasic/IGESBasic_ToolExternalRefFileIndex.cxx +++ b/src/IGESBasic/IGESBasic_ToolExternalRefFileIndex.cxx @@ -149,5 +149,5 @@ void IGESBasic_ToolExternalRefFileIndex::OwnDump dumper.Dump (ent->Entity(i),S, 1); S << "\n"; } - S << std::endl; + S << '\n'; } diff --git a/src/IGESBasic/IGESBasic_ToolExternalRefFileName.cxx b/src/IGESBasic/IGESBasic_ToolExternalRefFileName.cxx index 6d1e20c740..b8eeaa8bb6 100644 --- a/src/IGESBasic/IGESBasic_ToolExternalRefFileName.cxx +++ b/src/IGESBasic/IGESBasic_ToolExternalRefFileName.cxx @@ -104,5 +104,5 @@ void IGESBasic_ToolExternalRefFileName::OwnDump S << "\n" << "External Reference Symbolic Name : "; IGESData_DumpString(S,ent->ReferenceName()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESBasic/IGESBasic_ToolExternalRefLibName.cxx b/src/IGESBasic/IGESBasic_ToolExternalRefLibName.cxx index ee24ab565b..002abc4fe5 100644 --- a/src/IGESBasic/IGESBasic_ToolExternalRefLibName.cxx +++ b/src/IGESBasic/IGESBasic_ToolExternalRefLibName.cxx @@ -101,5 +101,5 @@ void IGESBasic_ToolExternalRefLibName::OwnDump S << "\n" << "External Reference Symbolic Name : "; IGESData_DumpString(S,ent->ReferenceName()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESBasic/IGESBasic_ToolExternalRefName.cxx b/src/IGESBasic/IGESBasic_ToolExternalRefName.cxx index 1c0135ea15..244017c5d3 100644 --- a/src/IGESBasic/IGESBasic_ToolExternalRefName.cxx +++ b/src/IGESBasic/IGESBasic_ToolExternalRefName.cxx @@ -93,5 +93,5 @@ void IGESBasic_ToolExternalRefName::OwnDump S << "IGESBasic_ExternalRefName\n" << "External Reference Symbolic Name : "; IGESData_DumpString(S,ent->ReferenceName()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESBasic/IGESBasic_ToolExternalReferenceFile.cxx b/src/IGESBasic/IGESBasic_ToolExternalReferenceFile.cxx index 806b576b20..fd893336bc 100644 --- a/src/IGESBasic/IGESBasic_ToolExternalReferenceFile.cxx +++ b/src/IGESBasic/IGESBasic_ToolExternalReferenceFile.cxx @@ -108,5 +108,5 @@ void IGESBasic_ToolExternalReferenceFile::OwnDump S << "IGESBasic_ExternalReferenceFile\n" << "External Reference Names : "; IGESData_DumpStrings(S,level,1, ent->NbListEntries(),ent->Name); - S << std::endl; + S << '\n'; } diff --git a/src/IGESBasic/IGESBasic_ToolGroup.cxx b/src/IGESBasic/IGESBasic_ToolGroup.cxx index 3fa773db3b..8a4d46875f 100644 --- a/src/IGESBasic/IGESBasic_ToolGroup.cxx +++ b/src/IGESBasic/IGESBasic_ToolGroup.cxx @@ -166,6 +166,6 @@ void IGESBasic_ToolGroup::OwnDump S << "IGESBasic_Group\n" << "Entries in the Group : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbEntities(),ent->Entity); - S << std::endl; + S << '\n'; } diff --git a/src/IGESBasic/IGESBasic_ToolGroupWithoutBackP.cxx b/src/IGESBasic/IGESBasic_ToolGroupWithoutBackP.cxx index 2e05a72237..e9fa4d03d1 100644 --- a/src/IGESBasic/IGESBasic_ToolGroupWithoutBackP.cxx +++ b/src/IGESBasic/IGESBasic_ToolGroupWithoutBackP.cxx @@ -164,6 +164,6 @@ void IGESBasic_ToolGroupWithoutBackP::OwnDump S << "IGESBasic_GroupWithoutBackP\n" << "Entries in the Group : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbEntities(),ent->Entity); - S << std::endl; + S << '\n'; } diff --git a/src/IGESBasic/IGESBasic_ToolHierarchy.cxx b/src/IGESBasic/IGESBasic_ToolHierarchy.cxx index e0bcae04dd..3139004b3a 100644 --- a/src/IGESBasic/IGESBasic_ToolHierarchy.cxx +++ b/src/IGESBasic/IGESBasic_ToolHierarchy.cxx @@ -136,5 +136,5 @@ void IGESBasic_ToolHierarchy::OwnDump << "Entity level : " << ent->NewEntityLevel() << "\n" << "Blank status : " << ent->NewBlankStatus() << "\n" << "Line weight : " << ent->NewLineWeight() << "\n" - << "Color number : " << ent->NewColorNum() << std::endl; + << "Color number : " << ent->NewColorNum() << '\n'; } diff --git a/src/IGESBasic/IGESBasic_ToolName.cxx b/src/IGESBasic/IGESBasic_ToolName.cxx index cbcfd4d795..33224058a3 100644 --- a/src/IGESBasic/IGESBasic_ToolName.cxx +++ b/src/IGESBasic/IGESBasic_ToolName.cxx @@ -107,5 +107,5 @@ void IGESBasic_ToolName::OwnDump << "Number of property values : " << ent->NbPropertyValues() << "\n" << "Name : "; IGESData_DumpString(S,ent->Value()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESBasic/IGESBasic_ToolOrderedGroup.cxx b/src/IGESBasic/IGESBasic_ToolOrderedGroup.cxx index 1d04c44925..1bce018ede 100644 --- a/src/IGESBasic/IGESBasic_ToolOrderedGroup.cxx +++ b/src/IGESBasic/IGESBasic_ToolOrderedGroup.cxx @@ -155,6 +155,6 @@ void IGESBasic_ToolOrderedGroup::OwnDump S << "IGESBasic_OrderedGroup\n" << "Entries in the Group : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbEntities(),ent->Entity); - S << std::endl; + S << '\n'; } diff --git a/src/IGESBasic/IGESBasic_ToolOrderedGroupWithoutBackP.cxx b/src/IGESBasic/IGESBasic_ToolOrderedGroupWithoutBackP.cxx index cd890e737c..da344e5df6 100644 --- a/src/IGESBasic/IGESBasic_ToolOrderedGroupWithoutBackP.cxx +++ b/src/IGESBasic/IGESBasic_ToolOrderedGroupWithoutBackP.cxx @@ -156,6 +156,6 @@ void IGESBasic_ToolOrderedGroupWithoutBackP::OwnDump S << "IGESBasic_OrderedGroupWithoutBackP\n" << "Entries in the Group : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbEntities(),ent->Entity); - S << std::endl; + S << '\n'; } diff --git a/src/IGESBasic/IGESBasic_ToolSingleParent.cxx b/src/IGESBasic/IGESBasic_ToolSingleParent.cxx index a163f1171c..760c2f2613 100644 --- a/src/IGESBasic/IGESBasic_ToolSingleParent.cxx +++ b/src/IGESBasic/IGESBasic_ToolSingleParent.cxx @@ -184,5 +184,5 @@ void IGESBasic_ToolSingleParent::OwnDump S << "\n" << "Children : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbChildren(),ent->Child); - S << std::endl; + S << '\n'; } diff --git a/src/IGESBasic/IGESBasic_ToolSingularSubfigure.cxx b/src/IGESBasic/IGESBasic_ToolSingularSubfigure.cxx index 04029a4ee9..618776bbd1 100644 --- a/src/IGESBasic/IGESBasic_ToolSingularSubfigure.cxx +++ b/src/IGESBasic/IGESBasic_ToolSingularSubfigure.cxx @@ -164,5 +164,5 @@ void IGESBasic_ToolSingularSubfigure::OwnDump << " Translation Data : "; IGESData_DumpXYZL(S,level, ent->Translation(), ent->Location()); S << " Scale Factors : " << ent->ScaleFactor() << "\n" - << std::endl; + << '\n'; } diff --git a/src/IGESBasic/IGESBasic_ToolSubfigureDef.cxx b/src/IGESBasic/IGESBasic_ToolSubfigureDef.cxx index 8588168c08..8c76128a72 100644 --- a/src/IGESBasic/IGESBasic_ToolSubfigureDef.cxx +++ b/src/IGESBasic/IGESBasic_ToolSubfigureDef.cxx @@ -149,5 +149,5 @@ void IGESBasic_ToolSubfigureDef::OwnDump S << "\n" << "The Associated Entities : "; IGESData_DumpEntities(S,dumper,level,1,ent->NbEntities(),ent->AssociatedEntity); - S << std::endl; + S << '\n'; } diff --git a/src/IGESControl/IGESControl_Reader.cxx b/src/IGESControl/IGESControl_Reader.cxx index 93eb955eaf..8c1a2f6f50 100644 --- a/src/IGESControl/IGESControl_Reader.cxx +++ b/src/IGESControl/IGESControl_Reader.cxx @@ -240,7 +240,7 @@ void IGESControl_Reader::PrintTransferInfo for(; aMapCountIter.More() && aMapListIter.More(); aMapCountIter.Next(), aMapListIter.Next()) { Message_Messenger::StreamBuffer aSender = TF->SendInfo(); - aSender << aMapCountIter.Value() << aMapCountIter.Key() << std::endl; + aSender << aMapCountIter.Value() << aMapCountIter.Key() << '\n'; if (mode == IFSelect_ListByItem) { const Handle(TColStd_HSequenceOfInteger)& entityList = aMapListIter.Value(); Standard_Integer length = entityList->Length(); @@ -260,7 +260,7 @@ void IGESControl_Reader::PrintTransferInfo aSender << line; } } - aSender << std::endl; + aSender << '\n'; } } break; @@ -274,7 +274,7 @@ void IGESControl_Reader::PrintTransferInfo NCollection_DataMap::Iterator aMapIter(aMapCountResult); for (; aMapIter.More(); aMapIter.Next()) { - TF->SendInfo() << aMapIter.Key() << aMapIter.Value() << std::endl; + TF->SendInfo() << aMapIter.Key() << aMapIter.Value() << '\n'; } break; } @@ -304,7 +304,7 @@ void IGESControl_Reader::PrintTransferInfo for(; aMapCountIter.More(); aMapCountIter.Next()) { char mess[80]; sprintf(mess, aMapCountIter.Key().ToCString(), aMapCountIter.Value()); - TF->SendInfo() << mess << std::endl; //dicoCountIter.Value() << dicoCountIter.Name() << std::endl; + TF->SendInfo() << mess << '\n'; //dicoCountIter.Value() << dicoCountIter.Name() << std::endl; } break; } diff --git a/src/IGESData/IGESData_DefaultSpecific.cxx b/src/IGESData/IGESData_DefaultSpecific.cxx index 1b3efde211..81a43d08d7 100644 --- a/src/IGESData/IGESData_DefaultSpecific.cxx +++ b/src/IGESData/IGESData_DefaultSpecific.cxx @@ -54,5 +54,5 @@ IGESData_DefaultSpecific::IGESData_DefaultSpecific () else { S <<" ["<ParamValue(i)->String(); } if ( i == (i%5)*5) S << "\n"; } - S << std::endl; + S << '\n'; } diff --git a/src/IGESData/IGESData_IGESDumper.cxx b/src/IGESData/IGESData_IGESDumper.cxx index ec6c749a26..32426c4f14 100644 --- a/src/IGESData/IGESData_IGESDumper.cxx +++ b/src/IGESData/IGESData_IGESDumper.cxx @@ -108,7 +108,7 @@ IGESData_IGESDumper::IGESData_IGESDumper if (own >= 1) { if (ent->HasShortLabel()) S <<"**** Label :"<ShortLabel()->ToCString(); if (ent->HasSubScriptNumber()) S <<" SubScript:"<SubScriptNumber(); - if (ent->HasShortLabel()) S <HasShortLabel()) S <<'\n'; if (ent->HasTransf()) { S <<"** Transf.Matrix :"; PrintDNum(ent->Transf(),S); S <<"\n"; } @@ -140,13 +140,13 @@ IGESData_IGESDumper::IGESData_IGESDumper if (ent->LineWeightNumber() != 0) { S <<"** LineWeight Num:"<LineWeightNumber(); if (diratt > 0) S <<" -> Value:"<LineWeight(); - S <DefColor() == IGESData_DefValue) { S <<"** Color Value :"<RankColor(); } else if (ent->DefColor() == IGESData_DefReference) { S <<"** Color Ref :"; PrintDNum (ent->Color(),S); } - S < 3) { S <<"**** Own Data ****\n\n"; @@ -177,7 +177,7 @@ IGESData_IGESDumper::IGESData_IGESDumper } } if (iasuit) { if (att <= 1) S << "\n"; } - S <<"\n**** End of Dump ****\n"<OwnDump(CN,ent,*this,S,own); else if (themodel.IsNull()) - S <<" **** Dump impossible. Type "<DynamicType()->Name()<DynamicType()->Name()<<'\n'; else S <<" **** Dump Impossible, n0:id:"<Number(ent)<<":D" - <DNum(ent)<<" Type "<DynamicType()->Name()<DNum(ent)<<" Type "<DynamicType()->Name()<<'\n'; } diff --git a/src/IGESData/IGESData_IGESModel.cxx b/src/IGESData/IGESData_IGESModel.cxx index 7f17a73e28..a11779ee41 100644 --- a/src/IGESData/IGESData_IGESModel.cxx +++ b/src/IGESData/IGESData_IGESModel.cxx @@ -77,11 +77,11 @@ void IGESData_IGESModel::DumpHeader (Standard_OStream& S, const Standard_Integer ) const { Standard_Integer ns = thestart->Length(); - S <<"**** Dump of IGES Model , Start and Global Sections ****"< 0) { S << "**** Start Section : "<Value(i)->ToCString()<Value(i)->ToCString()<<'\n'; } S << "\n**** Global Section ****\n"; char sep = theheader.Separator(); @@ -93,16 +93,16 @@ void IGESData_IGESModel::DumpHeader S <<"\n"; Handle(TCollection_HAsciiString) str; str = theheader.SendName(); - if (!str.IsNull()) S <<"[ 3] Sender : "<ToCString()<ToCString()<<'\n'; str = theheader.FileName(); - if (!str.IsNull()) S <<"[ 4] (recorded) File Name : "<ToCString()<ToCString()<<'\n'; str = theheader.SystemId(); - if (!str.IsNull()) S <<"[ 5] System Identification : "<ToCString()<ToCString()<<'\n'; str = theheader.InterfaceVersion(); - if (!str.IsNull()) S <<"[ 6] Interface Version : "<ToCString()<ToCString()<<'\n'; + S <<'\n'; S << "[ 7] Integer Bits : " << theheader.IntegerBits() - << " Features for Reals : " << std::endl; + << " Features for Reals : " << '\n'; S << "[ 8] Single Max.Power(10) : " << theheader.MaxPower10Single(); S << " [ 9] Digits : " << theheader.MaxDigitsSingle()<<"\n"; S << "[10] Double Max.Power(10) : " << theheader.MaxPower10Double(); @@ -142,21 +142,21 @@ void IGESData_IGESModel::DumpHeader num = theheader.DraftingStandard(); S << "\n[24] Drafting Standard : " << num; if (num > 0) S << " -> Name : " << IGESData_BasicEditor::DraftingName(num); - S <ToCString() - <<" i.e. "<ToCString()<ToCString()<<'\n'; } - else S <<"[25] Last Change Date not defined (version IGES < 5.1)" << std::endl; + else S <<"[25] Last Change Date not defined (version IGES < 5.1)" << '\n'; if (theheader.HasApplicationProtocol()) { str = theheader.ApplicationProtocol(); - S << "[26] Application Protocol : " << str->ToCString() <ToCString() <<'\n'; } - S << " **** End of Dump ****"<IsRedefinedContent(i)) { - sout << " -- IGESWriter : Erroneous Entity N0."<ReportEntity(i); if (!rep.IsNull()) cnt = GetCasted(IGESData_IGESEntity,rep->Content()); if (cnt.IsNull()) cnt = ent; // secours @@ -146,7 +146,7 @@ void IGESData_IGESWriter::SendStartLine (const Standard_CString startline) undent->WriteOwnParams (*this); } else sout<<" -- IGESWriter : Not Processed for n0."<TypeNumber()<<" Form "<FormNumber()<TypeNumber()<<" Form "<FormNumber()<<'\n'; Associativities (cnt); Properties (cnt); @@ -492,12 +492,12 @@ Standard_Boolean IGESData_IGESWriter::Print (Standard_OStream& S) const Standard_Integer nbs = 1; if (thestar.IsNull()) { if (fnes) { - S << " *** EUCLID/STRIM DESKTOP CLIPBOARD ***"<Length(); for (i = 1; i <= nbs; i ++) { @@ -511,7 +511,7 @@ Standard_Boolean IGESData_IGESWriter::Print (Standard_OStream& S) const S << &blancs[line->Length()]; if (fnes) writefnes (S,finlin); else S << finlin; - S << std::endl; + S << '\n'; } } #ifdef PATIENCELOG @@ -531,7 +531,7 @@ Standard_Boolean IGESData_IGESWriter::Print (Standard_OStream& S) const S << &blancs[line->Length()]; if (fnes) writefnes (S,finlin); else S << finlin; - S << std::endl; + S << '\n'; isGood = S.good(); } if(!isGood) @@ -591,7 +591,7 @@ Standard_Boolean IGESData_IGESWriter::Print (Standard_OStream& S) const S << &blancs[line->Length()]; if (fnes) writefnes (S,finlin); else S << finlin; - S << std::endl; + S << '\n'; isGood = S.good(); #ifdef PATIENCELOG lignespatience --; diff --git a/src/IGESDefs/IGESDefs_ToolAssociativityDef.cxx b/src/IGESDefs/IGESDefs_ToolAssociativityDef.cxx index 0af582ca1b..aa89af5472 100644 --- a/src/IGESDefs/IGESDefs_ToolAssociativityDef.cxx +++ b/src/IGESDefs/IGESDefs_ToolAssociativityDef.cxx @@ -184,7 +184,7 @@ void IGESDefs_ToolAssociativityDef::OwnDump << "Number Of Items per Entry :\n" << "Items :\n"; IGESData_DumpVals(S,-level,1, ent->NbClassDefs(),ent->BackPointerReq); - S << std::endl; + S << '\n'; if (level > 4) { // Warning : Item is a JAGGED Array @@ -208,6 +208,6 @@ void IGESDefs_ToolAssociativityDef::OwnDump S << "]\n"; } } - S << std::endl; + S << '\n'; } diff --git a/src/IGESDefs/IGESDefs_ToolAttributeDef.cxx b/src/IGESDefs/IGESDefs_ToolAttributeDef.cxx index d6215e9e04..92e441bbb5 100644 --- a/src/IGESDefs/IGESDefs_ToolAttributeDef.cxx +++ b/src/IGESDefs/IGESDefs_ToolAttributeDef.cxx @@ -508,10 +508,10 @@ void IGESDefs_ToolAttributeDef::OwnDump S << " Attribute Value Pointer : "; dumper.Dump (ent->AttributeTextDisplay(i,j),S, sublevel); } - S << std::endl; + S << '\n'; } } } } - S << std::endl; + S << '\n'; } diff --git a/src/IGESDefs/IGESDefs_ToolAttributeTable.cxx b/src/IGESDefs/IGESDefs_ToolAttributeTable.cxx index 2f9ca93198..d2003cb3f2 100644 --- a/src/IGESDefs/IGESDefs_ToolAttributeTable.cxx +++ b/src/IGESDefs/IGESDefs_ToolAttributeTable.cxx @@ -347,5 +347,5 @@ void IGESDefs_ToolAttributeTable::OwnDump S << "\n"; } } - S << std::endl; + S << '\n'; } diff --git a/src/IGESDefs/IGESDefs_ToolGenericData.cxx b/src/IGESDefs/IGESDefs_ToolGenericData.cxx index e3f4f14199..417717db2c 100644 --- a/src/IGESDefs/IGESDefs_ToolGenericData.cxx +++ b/src/IGESDefs/IGESDefs_ToolGenericData.cxx @@ -256,7 +256,7 @@ void IGESDefs_ToolGenericData::OwnDump << "Number of property values : " << ent->NbPropertyValues() << "\n" << "Property Name : "; IGESData_DumpString(S,ent->Name()); - S << std::endl; + S << '\n'; switch (level) { case 4: @@ -292,5 +292,5 @@ void IGESDefs_ToolGenericData::OwnDump } } } - S << std::endl; + S << '\n'; } diff --git a/src/IGESDefs/IGESDefs_ToolMacroDef.cxx b/src/IGESDefs/IGESDefs_ToolMacroDef.cxx index f3b942df64..1debede15b 100644 --- a/src/IGESDefs/IGESDefs_ToolMacroDef.cxx +++ b/src/IGESDefs/IGESDefs_ToolMacroDef.cxx @@ -151,5 +151,5 @@ void IGESDefs_ToolMacroDef::OwnDump IGESData_DumpStrings(S,level,1, ent->NbStatements(),ent->LanguageStatement); S << "END MACRO : "; IGESData_DumpString(S,ent->ENDMACRO()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESDefs/IGESDefs_ToolTabularData.cxx b/src/IGESDefs/IGESDefs_ToolTabularData.cxx index 39b183931c..937b624cf6 100644 --- a/src/IGESDefs/IGESDefs_ToolTabularData.cxx +++ b/src/IGESDefs/IGESDefs_ToolTabularData.cxx @@ -236,19 +236,19 @@ void IGESDefs_ToolTabularData::OwnDump S << "\nNumber of values of independent variables : "; IGESData_DumpVals(S,level,1, nbIndeps,ent->NbValues); // ?? JAGGED ?? - S << std::endl << "Values of the independent variable : "; + S << '\n' << "Values of the independent variable : "; if (level < 5) S << " [ask level > 4]"; else { for (Standard_Integer ind = 1; ind <= nbIndeps; ind ++) { - S << std::endl << "[" << ind << "]:"; + S << '\n' << "[" << ind << "]:"; Standard_Integer nbi = ent->NbValues(ind); for (Standard_Integer iv = 1; iv <= nbi; iv ++) S << " " << ent->IndependentValue(ind,iv); } } // IGESData_DumpVals(aSender,level,1, nbIndeps,ent->IndependentValue); - S << std::endl << "Values of the dependent variable : "; + S << '\n' << "Values of the dependent variable : "; // IGESData_DumpVals(aSender,level,1, nbDeps,ent->DependentValue); S << " TO BE DONE" - << std::endl; + << '\n'; } diff --git a/src/IGESDefs/IGESDefs_ToolUnitsData.cxx b/src/IGESDefs/IGESDefs_ToolUnitsData.cxx index e6811be80b..5454d1a28b 100644 --- a/src/IGESDefs/IGESDefs_ToolUnitsData.cxx +++ b/src/IGESDefs/IGESDefs_ToolUnitsData.cxx @@ -173,5 +173,5 @@ void IGESDefs_ToolUnitsData::OwnDump << " ScaleFactor: " << ent->ScaleFactor(i) << "\n"; } } - S << std::endl; + S << '\n'; } diff --git a/src/IGESDimen/IGESDimen_ToolAngularDimension.cxx b/src/IGESDimen/IGESDimen_ToolAngularDimension.cxx index ffda840618..bc702a4236 100644 --- a/src/IGESDimen/IGESDimen_ToolAngularDimension.cxx +++ b/src/IGESDimen/IGESDimen_ToolAngularDimension.cxx @@ -164,6 +164,6 @@ void IGESDimen_ToolAngularDimension::OwnDump S << "\n" << "Second Leader Entity : "; dumper.Dump(ent->SecondLeader(),S, sublevel); - S << std::endl; + S << '\n'; } diff --git a/src/IGESDimen/IGESDimen_ToolBasicDimension.cxx b/src/IGESDimen/IGESDimen_ToolBasicDimension.cxx index 705065f8b0..4caa09ce10 100644 --- a/src/IGESDimen/IGESDimen_ToolBasicDimension.cxx +++ b/src/IGESDimen/IGESDimen_ToolBasicDimension.cxx @@ -130,6 +130,6 @@ void IGESDimen_ToolBasicDimension::OwnDump IGESData_DumpXY(S, ent->UpperRight()); S << "\n Upper left corner : "; IGESData_DumpXY(S, ent->UpperLeft()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESDimen/IGESDimen_ToolCenterLine.cxx b/src/IGESDimen/IGESDimen_ToolCenterLine.cxx index b9beb41dd4..48283a72e7 100644 --- a/src/IGESDimen/IGESDimen_ToolCenterLine.cxx +++ b/src/IGESDimen/IGESDimen_ToolCenterLine.cxx @@ -166,5 +166,5 @@ void IGESDimen_ToolCenterLine::OwnDump << "Data Points :\n"; IGESData_DumpListXYLZ(S,level,1, ent->NbPoints(),ent->Point, ent->Location(), ent->ZDisplacement()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESDimen/IGESDimen_ToolCurveDimension.cxx b/src/IGESDimen/IGESDimen_ToolCurveDimension.cxx index 8de88a2e67..c01beb0d29 100644 --- a/src/IGESDimen/IGESDimen_ToolCurveDimension.cxx +++ b/src/IGESDimen/IGESDimen_ToolCurveDimension.cxx @@ -174,5 +174,5 @@ void IGESDimen_ToolCurveDimension::OwnDump S << "\n" << "Second Witness Entity : "; dumper.Dump(ent->SecondWitnessLine(),S, sublevel); - S << std::endl; + S << '\n'; } diff --git a/src/IGESDimen/IGESDimen_ToolDiameterDimension.cxx b/src/IGESDimen/IGESDimen_ToolDiameterDimension.cxx index 6a2ebf953d..85118ecf75 100644 --- a/src/IGESDimen/IGESDimen_ToolDiameterDimension.cxx +++ b/src/IGESDimen/IGESDimen_ToolDiameterDimension.cxx @@ -134,6 +134,6 @@ void IGESDimen_ToolDiameterDimension::OwnDump S << "\n" << "Center Point : "; IGESData_DumpXYL(S,level, ent->Center(), ent->Location()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESDimen/IGESDimen_ToolDimensionDisplayData.cxx b/src/IGESDimen/IGESDimen_ToolDimensionDisplayData.cxx index d239362753..2f7117632a 100644 --- a/src/IGESDimen/IGESDimen_ToolDimensionDisplayData.cxx +++ b/src/IGESDimen/IGESDimen_ToolDimensionDisplayData.cxx @@ -348,5 +348,5 @@ void IGESDimen_ToolDimensionDisplayData::OwnDump << ", Start Index : " << ent->StartIndex(i) << ", End Index : " << ent->EndIndex(i) << "\n"; } - S << std::endl; + S << '\n'; } diff --git a/src/IGESDimen/IGESDimen_ToolDimensionTolerance.cxx b/src/IGESDimen/IGESDimen_ToolDimensionTolerance.cxx index 195d146f8a..16cda51253 100644 --- a/src/IGESDimen/IGESDimen_ToolDimensionTolerance.cxx +++ b/src/IGESDimen/IGESDimen_ToolDimensionTolerance.cxx @@ -161,6 +161,6 @@ void IGESDimen_ToolDimensionTolerance::OwnDump << "Lower Tolerance : " << ent->LowerTolerance() << "\n" << "Sign Suppression Flag : " << ( ent->SignSuppressionFlag() ? "True" : "False" ) << "\n" << "Fraction Flag : " << ent->FractionFlag() << "\n" - << "Precision : " << ent->Precision() << std::endl; + << "Precision : " << ent->Precision() << '\n'; } diff --git a/src/IGESDimen/IGESDimen_ToolDimensionUnits.cxx b/src/IGESDimen/IGESDimen_ToolDimensionUnits.cxx index 3ae37b44fa..495121c38e 100644 --- a/src/IGESDimen/IGESDimen_ToolDimensionUnits.cxx +++ b/src/IGESDimen/IGESDimen_ToolDimensionUnits.cxx @@ -159,5 +159,5 @@ void IGESDimen_ToolDimensionUnits::OwnDump << "Fraction Flag : " << ent->FractionFlag(); if (ent->FractionFlag() == 0) S << " Decimal , Precision : "; else S << " Fraction , Denominator : "; - S << ent->PrecisionOrDenominator() << std::endl; + S << ent->PrecisionOrDenominator() << '\n'; } diff --git a/src/IGESDimen/IGESDimen_ToolDimensionedGeometry.cxx b/src/IGESDimen/IGESDimen_ToolDimensionedGeometry.cxx index 6ed01db491..965cf2c34e 100644 --- a/src/IGESDimen/IGESDimen_ToolDimensionedGeometry.cxx +++ b/src/IGESDimen/IGESDimen_ToolDimensionedGeometry.cxx @@ -155,5 +155,5 @@ void IGESDimen_ToolDimensionedGeometry::OwnDump S << "\n" << "Geometry Entities : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbGeometryEntities(),ent->GeometryEntity); - S << std::endl; + S << '\n'; } diff --git a/src/IGESDimen/IGESDimen_ToolFlagNote.cxx b/src/IGESDimen/IGESDimen_ToolFlagNote.cxx index 5dffe106fd..84a4950414 100644 --- a/src/IGESDimen/IGESDimen_ToolFlagNote.cxx +++ b/src/IGESDimen/IGESDimen_ToolFlagNote.cxx @@ -159,5 +159,5 @@ void IGESDimen_ToolFlagNote::OwnDump S << "\n" << "Number of Leaders : " << ent->NbLeaders() << " Leaders : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbLeaders(),ent->Leader); - S << std::endl; + S << '\n'; } diff --git a/src/IGESDimen/IGESDimen_ToolGeneralLabel.cxx b/src/IGESDimen/IGESDimen_ToolGeneralLabel.cxx index ca2f17d19c..7f1f5acda0 100644 --- a/src/IGESDimen/IGESDimen_ToolGeneralLabel.cxx +++ b/src/IGESDimen/IGESDimen_ToolGeneralLabel.cxx @@ -138,6 +138,6 @@ void IGESDimen_ToolGeneralLabel::OwnDump << "Number of Leaders : " << ent->NbLeaders() << "\n" << "Leaders : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbLeaders(),ent->Leader); - S << std::endl; + S << '\n'; } diff --git a/src/IGESDimen/IGESDimen_ToolGeneralNote.cxx b/src/IGESDimen/IGESDimen_ToolGeneralNote.cxx index 834f632d5c..de8d667e2c 100644 --- a/src/IGESDimen/IGESDimen_ToolGeneralNote.cxx +++ b/src/IGESDimen/IGESDimen_ToolGeneralNote.cxx @@ -379,5 +379,5 @@ void IGESDimen_ToolGeneralNote::OwnDump S << "\n"; } } - S << std::endl; + S << '\n'; } diff --git a/src/IGESDimen/IGESDimen_ToolGeneralSymbol.cxx b/src/IGESDimen/IGESDimen_ToolGeneralSymbol.cxx index 139969f747..b839176703 100644 --- a/src/IGESDimen/IGESDimen_ToolGeneralSymbol.cxx +++ b/src/IGESDimen/IGESDimen_ToolGeneralSymbol.cxx @@ -179,5 +179,5 @@ void IGESDimen_ToolGeneralSymbol::OwnDump IGESData_DumpEntities(S,dumper ,level,1, ent->NbGeomEntities(),ent->GeomEntity); S << "\nLeader Arrows : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbLeaders(),ent->LeaderArrow); - S << std::endl; + S << '\n'; } diff --git a/src/IGESDimen/IGESDimen_ToolLeaderArrow.cxx b/src/IGESDimen/IGESDimen_ToolLeaderArrow.cxx index 47962c0c0d..9c34de103f 100644 --- a/src/IGESDimen/IGESDimen_ToolLeaderArrow.cxx +++ b/src/IGESDimen/IGESDimen_ToolLeaderArrow.cxx @@ -151,5 +151,5 @@ void IGESDimen_ToolLeaderArrow::OwnDump S << "\nSegment Tails : "; IGESData_DumpListXYLZ(S,level,1, ent->NbSegments(),ent->SegmentTail, ent->Location(), ent->ZDepth()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESDimen/IGESDimen_ToolLinearDimension.cxx b/src/IGESDimen/IGESDimen_ToolLinearDimension.cxx index 2f641358f0..ae7363e3cc 100644 --- a/src/IGESDimen/IGESDimen_ToolLinearDimension.cxx +++ b/src/IGESDimen/IGESDimen_ToolLinearDimension.cxx @@ -149,6 +149,6 @@ void IGESDimen_ToolLinearDimension::OwnDump S << "\n" << "Second Witness Entity : "; dumper.Dump(ent->SecondWitness(),S, sublevel); - S << std::endl; + S << '\n'; } diff --git a/src/IGESDimen/IGESDimen_ToolNewDimensionedGeometry.cxx b/src/IGESDimen/IGESDimen_ToolNewDimensionedGeometry.cxx index be0ba61d96..99d4a9d689 100644 --- a/src/IGESDimen/IGESDimen_ToolNewDimensionedGeometry.cxx +++ b/src/IGESDimen/IGESDimen_ToolNewDimensionedGeometry.cxx @@ -235,5 +235,5 @@ void IGESDimen_ToolNewDimensionedGeometry::OwnDump << "Point : "; IGESData_DumpXYZL(S,level, ent->Point(i), ent->Location()); } - S << std::endl; + S << '\n'; } diff --git a/src/IGESDimen/IGESDimen_ToolNewGeneralNote.cxx b/src/IGESDimen/IGESDimen_ToolNewGeneralNote.cxx index 3dbd10f733..b57603e292 100644 --- a/src/IGESDimen/IGESDimen_ToolNewGeneralNote.cxx +++ b/src/IGESDimen/IGESDimen_ToolNewGeneralNote.cxx @@ -532,5 +532,5 @@ void IGESDimen_ToolNewGeneralNote::OwnDump S << "\n"; } } - else S << std::endl; + else S << '\n'; } diff --git a/src/IGESDimen/IGESDimen_ToolRadiusDimension.cxx b/src/IGESDimen/IGESDimen_ToolRadiusDimension.cxx index e3adab3419..9c1984dbb1 100644 --- a/src/IGESDimen/IGESDimen_ToolRadiusDimension.cxx +++ b/src/IGESDimen/IGESDimen_ToolRadiusDimension.cxx @@ -144,5 +144,5 @@ void IGESDimen_ToolRadiusDimension::OwnDump dumper.Dump(ent->Leader2(),S, sublevel); S << "\n"; } - S << std::endl; + S << '\n'; } diff --git a/src/IGESDimen/IGESDimen_ToolSection.cxx b/src/IGESDimen/IGESDimen_ToolSection.cxx index 36eaf5f38c..76db0817a4 100644 --- a/src/IGESDimen/IGESDimen_ToolSection.cxx +++ b/src/IGESDimen/IGESDimen_ToolSection.cxx @@ -164,5 +164,5 @@ void IGESDimen_ToolSection::OwnDump << "Data Points : "; IGESData_DumpListXYLZ(S,level,1, ent->NbPoints(),ent->Point, ent->Location(), ent->ZDisplacement()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESDimen/IGESDimen_ToolWitnessLine.cxx b/src/IGESDimen/IGESDimen_ToolWitnessLine.cxx index 836ae65554..d2f18ace9f 100644 --- a/src/IGESDimen/IGESDimen_ToolWitnessLine.cxx +++ b/src/IGESDimen/IGESDimen_ToolWitnessLine.cxx @@ -165,5 +165,5 @@ void IGESDimen_ToolWitnessLine::OwnDump << "Data Points : "; IGESData_DumpListXYLZ(S,level,1, ent->NbPoints(),ent->Point, ent->Location(), ent->ZDisplacement()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESDraw/IGESDraw_ToolCircArraySubfigure.cxx b/src/IGESDraw/IGESDraw_ToolCircArraySubfigure.cxx index d05977e652..f8de3a87db 100644 --- a/src/IGESDraw/IGESDraw_ToolCircArraySubfigure.cxx +++ b/src/IGESDraw/IGESDraw_ToolCircArraySubfigure.cxx @@ -177,5 +177,5 @@ void IGESDraw_ToolCircArraySubfigure::OwnDump else S << "Do\n"; S << "The Do-Dont List : "; IGESData_DumpVals(S,level,1, ent->ListCount(),ent->ListPosition); - S << std::endl; + S << '\n'; } diff --git a/src/IGESDraw/IGESDraw_ToolConnectPoint.cxx b/src/IGESDraw/IGESDraw_ToolConnectPoint.cxx index e4422c9632..2cda5e47be 100644 --- a/src/IGESDraw/IGESDraw_ToolConnectPoint.cxx +++ b/src/IGESDraw/IGESDraw_ToolConnectPoint.cxx @@ -227,5 +227,5 @@ void IGESDraw_ToolConnectPoint::OwnDump << "Swap Flag : " << ( ent->SwapFlag() ? "True" : "False" ) << "\n" << "Owner Subfigure Entity : "; dumper.Dump(ent->OwnerSubfigure(),S, tempSubLevel); - S << std::endl; + S << '\n'; } diff --git a/src/IGESDraw/IGESDraw_ToolDrawing.cxx b/src/IGESDraw/IGESDraw_ToolDrawing.cxx index 17a78651ed..029102bfcd 100644 --- a/src/IGESDraw/IGESDraw_ToolDrawing.cxx +++ b/src/IGESDraw/IGESDraw_ToolDrawing.cxx @@ -290,5 +290,5 @@ void IGESDraw_ToolDrawing::OwnDump } S << "\nAnnotation Entities : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbAnnotations(),ent->Annotation); - S << std::endl; + S << '\n'; } diff --git a/src/IGESDraw/IGESDraw_ToolDrawingWithRotation.cxx b/src/IGESDraw/IGESDraw_ToolDrawingWithRotation.cxx index b8054e5586..cacf9eb685 100644 --- a/src/IGESDraw/IGESDraw_ToolDrawingWithRotation.cxx +++ b/src/IGESDraw/IGESDraw_ToolDrawingWithRotation.cxx @@ -304,5 +304,5 @@ void IGESDraw_ToolDrawingWithRotation::OwnDump } S << "Annotation Entities : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbAnnotations(),ent->Annotation); - S << std::endl; + S << '\n'; } diff --git a/src/IGESDraw/IGESDraw_ToolLabelDisplay.cxx b/src/IGESDraw/IGESDraw_ToolLabelDisplay.cxx index e3365b3a94..9e67230fe0 100644 --- a/src/IGESDraw/IGESDraw_ToolLabelDisplay.cxx +++ b/src/IGESDraw/IGESDraw_ToolLabelDisplay.cxx @@ -229,5 +229,5 @@ void IGESDraw_ToolLabelDisplay::OwnDump S << "\n"; } } - S << std::endl; + S << '\n'; } diff --git a/src/IGESDraw/IGESDraw_ToolNetworkSubfigure.cxx b/src/IGESDraw/IGESDraw_ToolNetworkSubfigure.cxx index 3de40a511a..cb659ead1b 100644 --- a/src/IGESDraw/IGESDraw_ToolNetworkSubfigure.cxx +++ b/src/IGESDraw/IGESDraw_ToolNetworkSubfigure.cxx @@ -241,5 +241,5 @@ void IGESDraw_ToolNetworkSubfigure::OwnDump dumper.Dump(ent->DesignatorTemplate(),S, sublevel); S << "\nConnect Points : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbConnectPoints(),ent->ConnectPoint); - S << std::endl; + S << '\n'; } diff --git a/src/IGESDraw/IGESDraw_ToolNetworkSubfigureDef.cxx b/src/IGESDraw/IGESDraw_ToolNetworkSubfigureDef.cxx index f7ab2068dd..04bd7b06b6 100644 --- a/src/IGESDraw/IGESDraw_ToolNetworkSubfigureDef.cxx +++ b/src/IGESDraw/IGESDraw_ToolNetworkSubfigureDef.cxx @@ -234,5 +234,5 @@ void IGESDraw_ToolNetworkSubfigureDef::OwnDump dumper.Dump(ent->DesignatorTemplate(),S, tempSubLevel); S << "\nConnect Point Entities : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbPointEntities(),ent->PointEntity); - S << std::endl; + S << '\n'; } diff --git a/src/IGESDraw/IGESDraw_ToolPerspectiveView.cxx b/src/IGESDraw/IGESDraw_ToolPerspectiveView.cxx index a0b30b7a47..ba8afcc047 100644 --- a/src/IGESDraw/IGESDraw_ToolPerspectiveView.cxx +++ b/src/IGESDraw/IGESDraw_ToolPerspectiveView.cxx @@ -194,5 +194,5 @@ void IGESDraw_ToolPerspectiveView::OwnDump } S << "Back Plane Distance : " << ent->BackPlaneDistance() << " " << "Front Plane Distance : " << ent->FrontPlaneDistance() << "\n" - << std::endl; + << '\n'; } diff --git a/src/IGESDraw/IGESDraw_ToolPlanar.cxx b/src/IGESDraw/IGESDraw_ToolPlanar.cxx index 391ecf4063..65723e07f2 100644 --- a/src/IGESDraw/IGESDraw_ToolPlanar.cxx +++ b/src/IGESDraw/IGESDraw_ToolPlanar.cxx @@ -178,5 +178,5 @@ void IGESDraw_ToolPlanar::OwnDump S << "\n" << "Array of Entities on the specified plane : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbEntities(),ent->Entity); - S << std::endl; + S << '\n'; } diff --git a/src/IGESDraw/IGESDraw_ToolRectArraySubfigure.cxx b/src/IGESDraw/IGESDraw_ToolRectArraySubfigure.cxx index e964038531..214d11dee6 100644 --- a/src/IGESDraw/IGESDraw_ToolRectArraySubfigure.cxx +++ b/src/IGESDraw/IGESDraw_ToolRectArraySubfigure.cxx @@ -193,5 +193,5 @@ void IGESDraw_ToolRectArraySubfigure::OwnDump else S << "(0)Do "; S << "Do-Dont List : "; IGESData_DumpVals(S,level,1, ent->ListCount(),ent->ListPosition); - S << std::endl; + S << '\n'; } diff --git a/src/IGESDraw/IGESDraw_ToolSegmentedViewsVisible.cxx b/src/IGESDraw/IGESDraw_ToolSegmentedViewsVisible.cxx index a45076a336..f135c15a69 100644 --- a/src/IGESDraw/IGESDraw_ToolSegmentedViewsVisible.cxx +++ b/src/IGESDraw/IGESDraw_ToolSegmentedViewsVisible.cxx @@ -328,5 +328,5 @@ void IGESDraw_ToolSegmentedViewsVisible::OwnDump } break; } - S << std::endl; + S << '\n'; } diff --git a/src/IGESDraw/IGESDraw_ToolView.cxx b/src/IGESDraw/IGESDraw_ToolView.cxx index e9fbd28a72..f4f3c7c4b5 100644 --- a/src/IGESDraw/IGESDraw_ToolView.cxx +++ b/src/IGESDraw/IGESDraw_ToolView.cxx @@ -168,5 +168,5 @@ void IGESDraw_ToolView::OwnDump S << "Back Plane Of View Volume : "; dumper.Dump(ent->BackPlane(),S, tempSubLevel); S << "\n"; S << "Front Plane Of View Volume : "; - dumper.Dump(ent->FrontPlane(),S, tempSubLevel); S << std::endl; + dumper.Dump(ent->FrontPlane(),S, tempSubLevel); S << '\n'; } diff --git a/src/IGESDraw/IGESDraw_ToolViewsVisible.cxx b/src/IGESDraw/IGESDraw_ToolViewsVisible.cxx index 8480f21b94..1b1b6a63ac 100644 --- a/src/IGESDraw/IGESDraw_ToolViewsVisible.cxx +++ b/src/IGESDraw/IGESDraw_ToolViewsVisible.cxx @@ -228,7 +228,7 @@ void IGESDraw_ToolViewsVisible::OwnDump S << "\n" << "Entities Displayed : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbDisplayedEntities(),ent->DisplayedEntity); - S << std::endl; + S << '\n'; } Standard_Boolean IGESDraw_ToolViewsVisible::OwnCorrect diff --git a/src/IGESDraw/IGESDraw_ToolViewsVisibleWithAttr.cxx b/src/IGESDraw/IGESDraw_ToolViewsVisibleWithAttr.cxx index fdd813ca0c..eab8a23035 100644 --- a/src/IGESDraw/IGESDraw_ToolViewsVisibleWithAttr.cxx +++ b/src/IGESDraw/IGESDraw_ToolViewsVisibleWithAttr.cxx @@ -362,7 +362,7 @@ void IGESDraw_ToolViewsVisibleWithAttr::OwnDump if (ent->IsColorDefinition(I)) { S << "Color Definition : "; dumper.Dump (ent->ColorDefinition(I),S, tempSubLevel); - S << std::endl; + S << '\n'; } else S << "Color Value : " << ent->ColorValue(I) << "\n"; @@ -371,7 +371,7 @@ void IGESDraw_ToolViewsVisibleWithAttr::OwnDump } S << "Displayed Entities : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbDisplayedEntities(),ent->DisplayedEntity); - S << std::endl; + S << '\n'; } Standard_Boolean IGESDraw_ToolViewsVisibleWithAttr::OwnCorrect diff --git a/src/IGESGeom/IGESGeom_ToolBSplineCurve.cxx b/src/IGESGeom/IGESGeom_ToolBSplineCurve.cxx index 1c833e39f0..97f8fcb2b1 100644 --- a/src/IGESGeom/IGESGeom_ToolBSplineCurve.cxx +++ b/src/IGESGeom/IGESGeom_ToolBSplineCurve.cxx @@ -419,5 +419,5 @@ void IGESGeom_ToolBSplineCurve::OwnDump(const Handle(IGESGeom_BSplineCurve)& ent << " Ending Parameter Value : " << ent->UMax() << "\n" << "Unit Normal : "; IGESData_DumpXYZL(S,level, ent->Normal(), ent->Location()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESGeom/IGESGeom_ToolBSplineSurface.cxx b/src/IGESGeom/IGESGeom_ToolBSplineSurface.cxx index f40f38050d..f10ea8a267 100644 --- a/src/IGESGeom/IGESGeom_ToolBSplineSurface.cxx +++ b/src/IGESGeom/IGESGeom_ToolBSplineSurface.cxx @@ -500,7 +500,7 @@ void IGESGeom_ToolBSplineSurface::OwnDump(const Handle(IGESGeom_BSplineSurface)& S << "\n" << "Control Points (Poles) : "; //IGESData_DumpRectXYZL(S,level,1, ent->NbPoles(),ent->Pole, ent->Location()); - if (level < 5) { S << " [ content : ask level > 4 ]" << std::endl; return; } + if (level < 5) { S << " [ content : ask level > 4 ]" << '\n'; return; } gp_GTrsf loca = ent->Location(); for (Standard_Integer JP = 0; JP <= indV; JP ++) for (Standard_Integer IP = 0; IP <= indU; IP ++) { @@ -508,5 +508,5 @@ void IGESGeom_ToolBSplineSurface::OwnDump(const Handle(IGESGeom_BSplineSurface)& S <<" - ["<Pole(IP,JP),loca); } - S << std::endl; + S << '\n'; } diff --git a/src/IGESGeom/IGESGeom_ToolBoundary.cxx b/src/IGESGeom/IGESGeom_ToolBoundary.cxx index 44dbde2482..f9edf9f60a 100644 --- a/src/IGESGeom/IGESGeom_ToolBoundary.cxx +++ b/src/IGESGeom/IGESGeom_ToolBoundary.cxx @@ -461,5 +461,5 @@ void IGESGeom_ToolBoundary::OwnDump(const Handle(IGESGeom_Boundary)& ent, } S << "\n"; } - S << std::endl; + S << '\n'; } diff --git a/src/IGESGeom/IGESGeom_ToolBoundedSurface.cxx b/src/IGESGeom/IGESGeom_ToolBoundedSurface.cxx index df639d7a4e..bc8a3388f8 100644 --- a/src/IGESGeom/IGESGeom_ToolBoundedSurface.cxx +++ b/src/IGESGeom/IGESGeom_ToolBoundedSurface.cxx @@ -257,5 +257,5 @@ void IGESGeom_ToolBoundedSurface::OwnDump(const Handle(IGESGeom_BoundedSurface)& S << "\n" << "Boundary Entities : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbBoundaries(),ent->Boundary); - S << std::endl; + S << '\n'; } diff --git a/src/IGESGeom/IGESGeom_ToolCircularArc.cxx b/src/IGESGeom/IGESGeom_ToolCircularArc.cxx index ee0128f141..099bbf1451 100644 --- a/src/IGESGeom/IGESGeom_ToolCircularArc.cxx +++ b/src/IGESGeom/IGESGeom_ToolCircularArc.cxx @@ -153,5 +153,5 @@ void IGESGeom_ToolCircularArc::OwnDump S << "\n"; if (level <= 5) return; S << " Normal Axis : "; IGESData_DumpXYZL(S,level,ent->Axis(),ent->VectorLocation()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESGeom/IGESGeom_ToolCompositeCurve.cxx b/src/IGESGeom/IGESGeom_ToolCompositeCurve.cxx index 9dd04bcea2..c92e149efd 100644 --- a/src/IGESGeom/IGESGeom_ToolCompositeCurve.cxx +++ b/src/IGESGeom/IGESGeom_ToolCompositeCurve.cxx @@ -122,5 +122,5 @@ void IGESGeom_ToolCompositeCurve::OwnDump S << "IGESGeom_CompositeCurve\n" << "Curve Entities :\n"; IGESData_DumpEntities(S,dumper ,level,1, ent->NbCurves(),ent->Curve); - S << std::endl; + S << '\n'; } diff --git a/src/IGESGeom/IGESGeom_ToolConicArc.cxx b/src/IGESGeom/IGESGeom_ToolConicArc.cxx index a093776532..10f0ecc436 100644 --- a/src/IGESGeom/IGESGeom_ToolConicArc.cxx +++ b/src/IGESGeom/IGESGeom_ToolConicArc.cxx @@ -302,7 +302,7 @@ void IGESGeom_ToolConicArc::OwnDump(const Handle(IGESGeom_ConicArc)& ent, << "End Point : "; IGESData_DumpXYLZ(S,level, ent->EndPoint(), ent->Location(), ent->ZPlane()); S << "\n"; - if (level <= 4) S <<" -- Computed Definition : ask level > 4" << std::endl; + if (level <= 4) S <<" -- Computed Definition : ask level > 4" << '\n'; else { gp_Pnt Cen; gp_Dir Ax; Standard_Real Rmin,Rmax; ent->Definition (Cen,Ax,Rmin,Rmax); @@ -319,6 +319,6 @@ void IGESGeom_ToolConicArc::OwnDump(const Handle(IGESGeom_ConicArc)& ent, else S << " Major Radius : " << Rmax << " Minor Radius : " << Rmin <<"\n"; S << " Normal Axis : "; IGESData_DumpXYZL(S,level,ent->Axis(),ent->VectorLocation()); - S << std::endl; + S << '\n'; } } diff --git a/src/IGESGeom/IGESGeom_ToolCopiousData.cxx b/src/IGESGeom/IGESGeom_ToolCopiousData.cxx index 764079877c..61c7f3e799 100644 --- a/src/IGESGeom/IGESGeom_ToolCopiousData.cxx +++ b/src/IGESGeom/IGESGeom_ToolCopiousData.cxx @@ -305,9 +305,9 @@ void IGESGeom_ToolCopiousData::OwnDump(const Handle(IGESGeom_CopiousData)& ent, S << " Transformed ("<< T.X() << "," << T.Y() << "," << T.Z() << ")"; } } - S << std::endl; + S << '\n'; } } else S << " [ for content, ask level > 4 ]"; - S << std::endl; + S << '\n'; } diff --git a/src/IGESGeom/IGESGeom_ToolDirection.cxx b/src/IGESGeom/IGESGeom_ToolDirection.cxx index 686c948ff2..b23886db3f 100644 --- a/src/IGESGeom/IGESGeom_ToolDirection.cxx +++ b/src/IGESGeom/IGESGeom_ToolDirection.cxx @@ -117,5 +117,5 @@ void IGESGeom_ToolDirection::OwnDump S << "IGESGeom_Direction\n\n" << "Value : "; IGESData_DumpXYZL(S,level, ent->Value(), ent->VectorLocation()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESGeom/IGESGeom_ToolFlash.cxx b/src/IGESGeom/IGESGeom_ToolFlash.cxx index e51d1f1e59..8d5eb97a14 100644 --- a/src/IGESGeom/IGESGeom_ToolFlash.cxx +++ b/src/IGESGeom/IGESGeom_ToolFlash.cxx @@ -193,5 +193,5 @@ void IGESGeom_ToolFlash::OwnDump << " Rotation about reference entity : " << ent->Rotation() << "\n" << "Reference Entity : "; dumper.Dump(ent->ReferenceEntity(),S, sublevel); - S << std::endl; + S << '\n'; } diff --git a/src/IGESGeom/IGESGeom_ToolLine.cxx b/src/IGESGeom/IGESGeom_ToolLine.cxx index 1076950c42..10e769e30e 100644 --- a/src/IGESGeom/IGESGeom_ToolLine.cxx +++ b/src/IGESGeom/IGESGeom_ToolLine.cxx @@ -120,5 +120,5 @@ void IGESGeom_ToolLine::OwnDump S << "\n" "End Point : "; IGESData_DumpXYZL(S,level, ent->EndPoint(), ent->Location()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESGeom/IGESGeom_ToolOffsetCurve.cxx b/src/IGESGeom/IGESGeom_ToolOffsetCurve.cxx index 2feae9f38b..c8e29408e9 100644 --- a/src/IGESGeom/IGESGeom_ToolOffsetCurve.cxx +++ b/src/IGESGeom/IGESGeom_ToolOffsetCurve.cxx @@ -369,5 +369,5 @@ void IGESGeom_ToolOffsetCurve::OwnDump(const Handle(IGESGeom_OffsetCurve)& ent, << "Normal Vector : "; IGESData_DumpXYZL(S,level, ent->NormalVector(), ent->VectorLocation()); S <<"\n"; S << "Offset curve Parameters. Starting : " << ent->StartParameter() << " " - << "Ending : " << ent->EndParameter() << std::endl; + << "Ending : " << ent->EndParameter() << '\n'; } diff --git a/src/IGESGeom/IGESGeom_ToolOffsetSurface.cxx b/src/IGESGeom/IGESGeom_ToolOffsetSurface.cxx index ed237e7882..b3d3e17f45 100644 --- a/src/IGESGeom/IGESGeom_ToolOffsetSurface.cxx +++ b/src/IGESGeom/IGESGeom_ToolOffsetSurface.cxx @@ -155,5 +155,5 @@ void IGESGeom_ToolOffsetSurface::OwnDump << "Offset Distance : " << ent->Distance() << " " << "Surface to be offset : "; dumper.Dump(ent->Surface(),S, sublevel); - S << std::endl; + S << '\n'; } diff --git a/src/IGESGeom/IGESGeom_ToolPlane.cxx b/src/IGESGeom/IGESGeom_ToolPlane.cxx index 6c39c7ae6f..61eb351be5 100644 --- a/src/IGESGeom/IGESGeom_ToolPlane.cxx +++ b/src/IGESGeom/IGESGeom_ToolPlane.cxx @@ -279,5 +279,5 @@ void IGESGeom_ToolPlane::OwnDump(const Handle(IGESGeom_Plane)& ent, S << "\n" << "Display Symbol Location : "; IGESData_DumpXYZL(S,level, ent->SymbolAttach(), ent->Location()); - S << " Size : " << ent->SymbolSize() << std::endl; + S << " Size : " << ent->SymbolSize() << '\n'; } diff --git a/src/IGESGeom/IGESGeom_ToolPoint.cxx b/src/IGESGeom/IGESGeom_ToolPoint.cxx index 84b1fd8dad..7b35c6d8b2 100644 --- a/src/IGESGeom/IGESGeom_ToolPoint.cxx +++ b/src/IGESGeom/IGESGeom_ToolPoint.cxx @@ -148,5 +148,5 @@ void IGESGeom_ToolPoint::OwnDump S << "\n" << " Display Symbol : "; dumper.Dump(ent->DisplaySymbol(),S, (level <= 4) ? 0 : 1); - S << std::endl; + S << '\n'; } diff --git a/src/IGESGeom/IGESGeom_ToolSplineCurve.cxx b/src/IGESGeom/IGESGeom_ToolSplineCurve.cxx index 0370e5468d..475ca353d7 100644 --- a/src/IGESGeom/IGESGeom_ToolSplineCurve.cxx +++ b/src/IGESGeom/IGESGeom_ToolSplineCurve.cxx @@ -339,7 +339,7 @@ void IGESGeom_ToolSplineCurve::OwnDump << "Segment Break Points : "; IGESData_DumpVals(S,level,1, nbSegments+1,ent->BreakPoint); if (level <= 4) { - S << " [ also ask level > 4 for X-Y-Z Polynomials ]" << std::endl; + S << " [ also ask level > 4 for X-Y-Z Polynomials ]" << '\n'; return; } S << " -- Polynomial Values --\n"; @@ -363,5 +363,5 @@ void IGESGeom_ToolSplineCurve::OwnDump << " Value "<Generatrix(),S, sublevel); S << "\n" << "Start Angle : " << ent->StartAngle() << " " - << "End Angle : " << ent->EndAngle() << std::endl; + << "End Angle : " << ent->EndAngle() << '\n'; } diff --git a/src/IGESGeom/IGESGeom_ToolTabulatedCylinder.cxx b/src/IGESGeom/IGESGeom_ToolTabulatedCylinder.cxx index 6991099c0a..bb7b9f6789 100644 --- a/src/IGESGeom/IGESGeom_ToolTabulatedCylinder.cxx +++ b/src/IGESGeom/IGESGeom_ToolTabulatedCylinder.cxx @@ -140,5 +140,5 @@ void IGESGeom_ToolTabulatedCylinder::OwnDump S << "\n" << "Terminate Point : "; IGESData_DumpXYZL(S,level, ent->EndPoint(), ent->Location()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESGeom/IGESGeom_ToolTransformationMatrix.cxx b/src/IGESGeom/IGESGeom_ToolTransformationMatrix.cxx index f00df51ea5..d39c637e3f 100644 --- a/src/IGESGeom/IGESGeom_ToolTransformationMatrix.cxx +++ b/src/IGESGeom/IGESGeom_ToolTransformationMatrix.cxx @@ -222,11 +222,11 @@ void IGESGeom_ToolTransformationMatrix::OwnDump << ent->Data(3, 3) << ", " << ent->Data(3, 4) << "\n"; switch (ent->FormNumber()) { - case 0 : S << "-- Direct Orthogonal Matrix" << std::endl; break; - case 1 : S << "-- Reverse Orthogonal Matrix" << std::endl; break; - case 10 : S << "-- Cartesien Coordinate System" << std::endl; break; - case 11 : S << "-- Cylindrical Coordinate System" << std::endl; break; - case 12 : S << "-- Spherical Coordinate System" << std::endl; break; - default : S << "-- (Incorrect Form Number)" << std::endl; break; + case 0 : S << "-- Direct Orthogonal Matrix" << '\n'; break; + case 1 : S << "-- Reverse Orthogonal Matrix" << '\n'; break; + case 10 : S << "-- Cartesien Coordinate System" << '\n'; break; + case 11 : S << "-- Cylindrical Coordinate System" << '\n'; break; + case 12 : S << "-- Spherical Coordinate System" << '\n'; break; + default : S << "-- (Incorrect Form Number)" << '\n'; break; } } diff --git a/src/IGESGeom/IGESGeom_ToolTrimmedSurface.cxx b/src/IGESGeom/IGESGeom_ToolTrimmedSurface.cxx index 425d8b01d5..875b548959 100644 --- a/src/IGESGeom/IGESGeom_ToolTrimmedSurface.cxx +++ b/src/IGESGeom/IGESGeom_ToolTrimmedSurface.cxx @@ -308,5 +308,5 @@ void IGESGeom_ToolTrimmedSurface::OwnDump(const Handle(IGESGeom_TrimmedSurface)& S << "\n" << "Inner Boundaries : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbInnerContours(),ent->InnerContour); - S << std::endl; + S << '\n'; } diff --git a/src/IGESGeom/IGESGeom_TransformationMatrix.cxx b/src/IGESGeom/IGESGeom_TransformationMatrix.cxx index 9cce88f585..5f709300ce 100644 --- a/src/IGESGeom/IGESGeom_TransformationMatrix.cxx +++ b/src/IGESGeom/IGESGeom_TransformationMatrix.cxx @@ -53,7 +53,7 @@ IGESGeom_TransformationMatrix::IGESGeom_TransformationMatrix () { } void IGESGeom_TransformationMatrix::SetFormNumber (const Standard_Integer fm) { if(theData.IsNull()) - std::cout<<"Inavalid Transformation Data"< 1) && (fm < 10 || fm > 12)) throw Standard_OutOfRange("IGESGeom_TransformationMatrix : SetFormNumber"); InitTypeAndForm(124,fm); } diff --git a/src/IGESGraph/IGESGraph_ToolColor.cxx b/src/IGESGraph/IGESGraph_ToolColor.cxx index d9d49dca18..c3f6ac3921 100644 --- a/src/IGESGraph/IGESGraph_ToolColor.cxx +++ b/src/IGESGraph/IGESGraph_ToolColor.cxx @@ -126,5 +126,5 @@ void IGESGraph_ToolColor::OwnDump << "Blue (in % Of Full Intensity) : " << Blue << "\n" << "Color Name : "; IGESData_DumpString(S,ent->ColorName()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESGraph/IGESGraph_ToolDefinitionLevel.cxx b/src/IGESGraph/IGESGraph_ToolDefinitionLevel.cxx index 4738adb9f6..9a4138d7aa 100644 --- a/src/IGESGraph/IGESGraph_ToolDefinitionLevel.cxx +++ b/src/IGESGraph/IGESGraph_ToolDefinitionLevel.cxx @@ -114,6 +114,6 @@ void IGESGraph_ToolDefinitionLevel::OwnDump S << "IGESGraph_DefinitionLevel\n" << "Level Numbers : "; IGESData_DumpVals(S,level,1, ent->NbPropertyValues(),ent->LevelNumber); - S << std::endl; + S << '\n'; } diff --git a/src/IGESGraph/IGESGraph_ToolDrawingSize.cxx b/src/IGESGraph/IGESGraph_ToolDrawingSize.cxx index bcbeb39eeb..4f0753a1f0 100644 --- a/src/IGESGraph/IGESGraph_ToolDrawingSize.cxx +++ b/src/IGESGraph/IGESGraph_ToolDrawingSize.cxx @@ -114,5 +114,5 @@ void IGESGraph_ToolDrawingSize::OwnDump << "No. of property values : " << ent->NbPropertyValues() << "\n" << "Drawing extent along positive X-axis : " << ent->XSize() << "\n" << "Drawing extent along positive Y-axis : " << ent->YSize() << "\n" - << std::endl; + << '\n'; } diff --git a/src/IGESGraph/IGESGraph_ToolDrawingUnits.cxx b/src/IGESGraph/IGESGraph_ToolDrawingUnits.cxx index e8ec8ee021..cb213454c3 100644 --- a/src/IGESGraph/IGESGraph_ToolDrawingUnits.cxx +++ b/src/IGESGraph/IGESGraph_ToolDrawingUnits.cxx @@ -226,5 +226,5 @@ void IGESGraph_ToolDrawingUnits::OwnDump << " Units Name : "; IGESData_DumpString(S,ent->Unit()); S << " computed Value (in meters) : " << ent->UnitValue() - << std::endl; + << '\n'; } diff --git a/src/IGESGraph/IGESGraph_ToolHighLight.cxx b/src/IGESGraph/IGESGraph_ToolHighLight.cxx index 9e2be289d8..c5e6108724 100644 --- a/src/IGESGraph/IGESGraph_ToolHighLight.cxx +++ b/src/IGESGraph/IGESGraph_ToolHighLight.cxx @@ -109,5 +109,5 @@ void IGESGraph_ToolHighLight::OwnDump S << "IGESGraph_HighLight\n" << "No. of property values : " << ent->NbPropertyValues() << "\n" << "Highlight Status : " << ent->HighLightStatus() << "\n" - << std::endl; + << '\n'; } diff --git a/src/IGESGraph/IGESGraph_ToolIntercharacterSpacing.cxx b/src/IGESGraph/IGESGraph_ToolIntercharacterSpacing.cxx index 01840365f6..2ac00dc260 100644 --- a/src/IGESGraph/IGESGraph_ToolIntercharacterSpacing.cxx +++ b/src/IGESGraph/IGESGraph_ToolIntercharacterSpacing.cxx @@ -111,5 +111,5 @@ void IGESGraph_ToolIntercharacterSpacing::OwnDump S << "IGESGraph_IntercharacterSpacing\n" << "No. of property values : " << ent->NbPropertyValues() << "\n" << "Intercharacter space in % of text height : " << ent->ISpace() << "\n" - << std::endl; + << '\n'; } diff --git a/src/IGESGraph/IGESGraph_ToolLineFontDefPattern.cxx b/src/IGESGraph/IGESGraph_ToolLineFontDefPattern.cxx index e9fad05cb6..66fe9853bb 100644 --- a/src/IGESGraph/IGESGraph_ToolLineFontDefPattern.cxx +++ b/src/IGESGraph/IGESGraph_ToolLineFontDefPattern.cxx @@ -140,6 +140,6 @@ void IGESGraph_ToolLineFontDefPattern::OwnDump for (Standard_Integer I = 1; I <= nb; I ++) { if (ent->IsVisible(I)) S << " " << I; } - S << std::endl; + S << '\n'; } } diff --git a/src/IGESGraph/IGESGraph_ToolLineFontDefTemplate.cxx b/src/IGESGraph/IGESGraph_ToolLineFontDefTemplate.cxx index 9e3bf9f607..aebd87edb7 100644 --- a/src/IGESGraph/IGESGraph_ToolLineFontDefTemplate.cxx +++ b/src/IGESGraph/IGESGraph_ToolLineFontDefTemplate.cxx @@ -126,6 +126,6 @@ void IGESGraph_ToolLineFontDefTemplate::OwnDump S << "\n" << "Length Between Successive Template Figure : " << ent->Distance()<< "\n" << "Scale Factor for Subfigure : " << ent->Scale() << "\n" - << std::endl; + << '\n'; } diff --git a/src/IGESGraph/IGESGraph_ToolLineFontPredefined.cxx b/src/IGESGraph/IGESGraph_ToolLineFontPredefined.cxx index 97c7e89edc..a1d8b8c540 100644 --- a/src/IGESGraph/IGESGraph_ToolLineFontPredefined.cxx +++ b/src/IGESGraph/IGESGraph_ToolLineFontPredefined.cxx @@ -108,5 +108,5 @@ void IGESGraph_ToolLineFontPredefined::OwnDump S << "IGESGraph_LineFontPredefined\n" << "No. of property values : " << ent->NbPropertyValues() << "\n" << "Line font pattern code : " << ent->LineFontPatternCode() << "\n" - << std::endl; + << '\n'; } diff --git a/src/IGESGraph/IGESGraph_ToolNominalSize.cxx b/src/IGESGraph/IGESGraph_ToolNominalSize.cxx index eb9ebe5da6..35f8855175 100644 --- a/src/IGESGraph/IGESGraph_ToolNominalSize.cxx +++ b/src/IGESGraph/IGESGraph_ToolNominalSize.cxx @@ -151,5 +151,5 @@ void IGESGraph_ToolNominalSize::OwnDump S << "\n" << "Name of relevant engineering standard : "; IGESData_DumpString(S,ent->StandardName()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESGraph/IGESGraph_ToolPick.cxx b/src/IGESGraph/IGESGraph_ToolPick.cxx index abeafb6292..5e24a1a577 100644 --- a/src/IGESGraph/IGESGraph_ToolPick.cxx +++ b/src/IGESGraph/IGESGraph_ToolPick.cxx @@ -112,5 +112,5 @@ void IGESGraph_ToolPick::OwnDump << "No. of property values : " << ent->NbPropertyValues() << "\n" << "Pick flag : " << ent->PickFlag() << (ent->PickFlag() == 0 ? " NO" : " YES" ) - << std::endl; + << '\n'; } diff --git a/src/IGESGraph/IGESGraph_ToolTextDisplayTemplate.cxx b/src/IGESGraph/IGESGraph_ToolTextDisplayTemplate.cxx index 0b5ea92caa..07ec1186cd 100644 --- a/src/IGESGraph/IGESGraph_ToolTextDisplayTemplate.cxx +++ b/src/IGESGraph/IGESGraph_ToolTextDisplayTemplate.cxx @@ -205,5 +205,5 @@ void IGESGraph_ToolTextDisplayTemplate::OwnDump else S << "Increments from coordinates : "; IGESData_DumpXYZL(S,level, ent->StartingCorner(), ent->Location()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESGraph/IGESGraph_ToolTextFontDef.cxx b/src/IGESGraph/IGESGraph_ToolTextFontDef.cxx index a302090d41..f3eea8264f 100644 --- a/src/IGESGraph/IGESGraph_ToolTextFontDef.cxx +++ b/src/IGESGraph/IGESGraph_ToolTextFontDef.cxx @@ -337,5 +337,5 @@ void IGESGraph_ToolTextFontDef::OwnDump } } } - S << std::endl; + S << '\n'; } diff --git a/src/IGESGraph/IGESGraph_ToolUniformRectGrid.cxx b/src/IGESGraph/IGESGraph_ToolUniformRectGrid.cxx index c316ecf0a0..2bf36db5a4 100644 --- a/src/IGESGraph/IGESGraph_ToolUniformRectGrid.cxx +++ b/src/IGESGraph/IGESGraph_ToolUniformRectGrid.cxx @@ -170,5 +170,5 @@ void IGESGraph_ToolUniformRectGrid::OwnDump IGESData_DumpXY(S, ent->GridSpacing()); S << "\n"; if (ent->IsFinite()) S << "No. of points/lines in direction : X : " << ent->NbPointsX() - << " - Y : " << ent->NbPointsY() << std::endl; + << " - Y : " << ent->NbPointsY() << '\n'; } diff --git a/src/IGESSelect/IGESSelect_Activator.cxx b/src/IGESSelect/IGESSelect_Activator.cxx index 48a60c95a7..5e57da119c 100644 --- a/src/IGESSelect/IGESSelect_Activator.cxx +++ b/src/IGESSelect/IGESSelect_Activator.cxx @@ -126,20 +126,20 @@ IGESSelect_Activator::IGESSelect_Activator() " l : liste resumee"<< " c : liste complete par item (mais pas pour remaining)\n"<< " r : idem + liste complete remaining\n"<< - " sur tout le modele. Ajouter nom selection pour lister sur une partie"<= 0 ? IFSelect_RetError : IFSelect_RetVoid); } if (arg1[0] == 'l') { listmode = 0; std::cout<<"Liste resumee"; } else if (arg1[0] == 'c') { - listmode = 1; std::cout<<"Liste complete par item (pas pour Remaining)"<NamedItem(arg2)); if (sel.IsNull()) { - std::cout<<"Pas une selection : "<AddList (WS->SelectionResult(sel)); @@ -163,20 +163,20 @@ IGESSelect_Activator::IGESSelect_Activator() if (number == 5) std::cout<<" Views & Drawings"; if (number == 6) std::cout<<" Drawings only (complete)"; if (number == 7) std::cout<<" Single Views & Drawing Frames"; - std::cout<<", on "<NbEntities()<<" ent.s, give "<NbEntities()<<" ent.s, give "<Model()->Number(vs->SetItem(i,listdr))<<" List:"; - std::cout<NbEntities(i)<<" ent.s:"<NbEntities(i)<<" ent.s:"<<'\n'; if (listmode == 0) continue; iter = sets->Entities(i); WS->ListEntities (iter, 0, std::cout); } std::cout <<" -- Remaining Entities (not yet sorted) :" - <NbDuplicated(0,Standard_False)<NbDuplicated(0,Standard_False)<<'\n'; if (listmode < 2) return IFSelect_RetVoid; iter = sets->Duplicated(0,Standard_False); WS->ListEntities (iter, 0, std::cout); @@ -186,7 +186,7 @@ IGESSelect_Activator::IGESSelect_Activator() case 10 : { // **** IGESType (form Type/Form) if (argc < 2) { std::cout<<"Donner le n0 de type desire, + en option la forme\n" - <<" Si pas de forme, prend toutes les formes du type demande"<NamedItem(arg1)); if (lev.IsNull()) { - std::cout< 4) { Rmin = Atof(pilot->Word(4).ToCString()); Rmax = Atof(pilot->Word(5).ToCString()); - if (Rmin <= 0 || Rmax <= 0) { std::cout<<"intervalle : donner reels > 0"< 0"<<'\n'; return IFSelect_RetError; } } Handle(IGESSelect_FloatFormat) fm = new IGESSelect_FloatFormat; if (argc == 2) fm->SetDefault(digits); @@ -295,17 +295,17 @@ IGESSelect_Activator::IGESSelect_Activator() case 41 : { // **** SetGlobalParameter if (argc < 3) { - std::cout<<"Donner entier=n0 param a changer + nom TextParam pour la valeur"<NamedItem(arg2)); if (val.IsNull()) { - std::cout<<"Pas un nom de TextParam:"< 0) S <<"REMARK for LEVEL LIST : Entities are counted in" - <<" \n, and in each Level value of their list"<\n, and in each Level value of their list"<<'\n'; } diff --git a/src/IGESSelect/IGESSelect_WorkLibrary.cxx b/src/IGESSelect/IGESSelect_WorkLibrary.cxx index 8524ef303f..63d5e27a8b 100644 --- a/src/IGESSelect/IGESSelect_WorkLibrary.cxx +++ b/src/IGESSelect/IGESSelect_WorkLibrary.cxx @@ -81,8 +81,8 @@ static Handle(IGESData_FileProtocol) IGESProto; char* pname=(char*) name; Standard_Integer status = IGESFile_Read (pname,igesmod,prot); - if (status < 0) sout<<"File not found : "< 0) sout<<"Error when reading file : "< 0) sout<<"Error when reading file : "<AddFail("IGES File could not be created"); - sout<<" - IGES File could not be created : " << ctx.FileName() << std::endl; return 0; + sout<<" - IGES File could not be created : " << ctx.FileName() << '\n'; return 0; } sout<<" IGES File Name : "<flush(); status = aStream->good() && status && !errno; aStream.reset(); if(errno) - sout << strerror(errno) << std::endl; + sout << strerror(errno) << '\n'; return status; } @@ -168,13 +168,13 @@ static Handle(IGESData_FileProtocol) IGESProto; Standard_Boolean iserr = model->IsRedefinedContent(num); Handle(Standard_Transient) con; if (iserr) con = model->ReportEntity(num)->Content(); - if (entity.IsNull()) { S <<" Null"<DynamicType()->Name(); - else S << "(undefined)" << std::endl; + else S << "(undefined)" << '\n'; igesent = GetCasted(IGESData_IGESEntity,con); con.Nullify(); Handle(Interface_Check) check = model->ReportEntity(num)->Check(); @@ -191,6 +191,6 @@ static Handle(IGESData_FileProtocol) IGESProto; dump.Dump(igesent,S,level,(level-1)/3); } catch (Standard_Failure const&) { - S << " ** Dump Interrupt **" << std::endl; + S << " ** Dump Interrupt **" << '\n'; } } diff --git a/src/IGESSolid/IGESSolid_ToolBlock.cxx b/src/IGESSolid/IGESSolid_ToolBlock.cxx index 25c5d3fa81..db7c8e356f 100644 --- a/src/IGESSolid/IGESSolid_ToolBlock.cxx +++ b/src/IGESSolid/IGESSolid_ToolBlock.cxx @@ -195,5 +195,5 @@ void IGESSolid_ToolBlock::OwnDump IGESData_DumpXYZL(S,level, ent->XAxis(), ent->VectorLocation()); S << "\nZAxis : "; IGESData_DumpXYZL(S,level, ent->ZAxis(), ent->VectorLocation()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESSolid/IGESSolid_ToolConeFrustum.cxx b/src/IGESSolid/IGESSolid_ToolConeFrustum.cxx index 40ee593205..6709dc7f67 100644 --- a/src/IGESSolid/IGESSolid_ToolConeFrustum.cxx +++ b/src/IGESSolid/IGESSolid_ToolConeFrustum.cxx @@ -178,5 +178,5 @@ void IGESSolid_ToolConeFrustum::OwnDump IGESData_DumpXYZL(S,level, ent->FaceCenter(), ent->Location()); S << "\nAxis : "; IGESData_DumpXYZL(S,level, ent->Axis(), ent->VectorLocation()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESSolid/IGESSolid_ToolConicalSurface.cxx b/src/IGESSolid/IGESSolid_ToolConicalSurface.cxx index d99e106cc2..f0630206b6 100644 --- a/src/IGESSolid/IGESSolid_ToolConicalSurface.cxx +++ b/src/IGESSolid/IGESSolid_ToolConicalSurface.cxx @@ -155,7 +155,7 @@ void IGESSolid_ToolConicalSurface::OwnDump { S << "Surface is Parametrised - Reference direction :\n"; dumper.Dump(ent->ReferenceDir(),S, sublevel); - S << std::endl; + S << '\n'; } - else S << "Surface is UnParametrised" << std::endl; + else S << "Surface is UnParametrised" << '\n'; } diff --git a/src/IGESSolid/IGESSolid_ToolCylinder.cxx b/src/IGESSolid/IGESSolid_ToolCylinder.cxx index 265083cba0..81dbca1761 100644 --- a/src/IGESSolid/IGESSolid_ToolCylinder.cxx +++ b/src/IGESSolid/IGESSolid_ToolCylinder.cxx @@ -171,5 +171,5 @@ void IGESSolid_ToolCylinder::OwnDump IGESData_DumpXYZL(S,level, ent->FaceCenter(), ent->Location()); S << "\nAxis : "; IGESData_DumpXYZL(S,level, ent->Axis(), ent->VectorLocation()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESSolid/IGESSolid_ToolCylindricalSurface.cxx b/src/IGESSolid/IGESSolid_ToolCylindricalSurface.cxx index 13659a2466..4c869f2987 100644 --- a/src/IGESSolid/IGESSolid_ToolCylindricalSurface.cxx +++ b/src/IGESSolid/IGESSolid_ToolCylindricalSurface.cxx @@ -147,7 +147,7 @@ void IGESSolid_ToolCylindricalSurface::OwnDump { S << "Surface is Parametrised - Reference direction : "; dumper.Dump(ent->ReferenceDir(),S, sublevel); - S << std::endl; + S << '\n'; } - else S << "Surface is UnParametrised" << std::endl; + else S << "Surface is UnParametrised" << '\n'; } diff --git a/src/IGESSolid/IGESSolid_ToolEdgeList.cxx b/src/IGESSolid/IGESSolid_ToolEdgeList.cxx index fabc1bfcdf..9756864691 100644 --- a/src/IGESSolid/IGESSolid_ToolEdgeList.cxx +++ b/src/IGESSolid/IGESSolid_ToolEdgeList.cxx @@ -382,5 +382,5 @@ void IGESSolid_ToolEdgeList::OwnDump(const Handle(IGESSolid_EdgeList)& ent, default : break; } - S << std::endl; + S << '\n'; } diff --git a/src/IGESSolid/IGESSolid_ToolEllipsoid.cxx b/src/IGESSolid/IGESSolid_ToolEllipsoid.cxx index 03d495e21c..94689e83c9 100644 --- a/src/IGESSolid/IGESSolid_ToolEllipsoid.cxx +++ b/src/IGESSolid/IGESSolid_ToolEllipsoid.cxx @@ -198,5 +198,5 @@ void IGESSolid_ToolEllipsoid::OwnDump IGESData_DumpXYZL(S,level, ent->XAxis(), ent->VectorLocation()); S << "\nZAxis : "; IGESData_DumpXYZL(S,level, ent->ZAxis(), ent->VectorLocation()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESSolid/IGESSolid_ToolFace.cxx b/src/IGESSolid/IGESSolid_ToolFace.cxx index 427f8e9b2d..3a8e6987ff 100644 --- a/src/IGESSolid/IGESSolid_ToolFace.cxx +++ b/src/IGESSolid/IGESSolid_ToolFace.cxx @@ -256,6 +256,6 @@ void IGESSolid_ToolFace::OwnDump(const Handle(IGESSolid_Face)& ent, else S << "Outer loop is not present\n"; S << "Loops : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbLoops(),ent->Loop); - S << std::endl; + S << '\n'; } diff --git a/src/IGESSolid/IGESSolid_ToolLoop.cxx b/src/IGESSolid/IGESSolid_ToolLoop.cxx index 1ab948d9b9..2e9c8f2cb8 100644 --- a/src/IGESSolid/IGESSolid_ToolLoop.cxx +++ b/src/IGESSolid/IGESSolid_ToolLoop.cxx @@ -415,5 +415,5 @@ void IGESSolid_ToolLoop::OwnDump(const Handle(IGESSolid_Loop)& ent, } S << " ]"; } - S << std::endl; + S << '\n'; } diff --git a/src/IGESSolid/IGESSolid_ToolManifoldSolid.cxx b/src/IGESSolid/IGESSolid_ToolManifoldSolid.cxx index 86bc360c0e..fba35d7ee2 100644 --- a/src/IGESSolid/IGESSolid_ToolManifoldSolid.cxx +++ b/src/IGESSolid/IGESSolid_ToolManifoldSolid.cxx @@ -217,7 +217,7 @@ void IGESSolid_ToolManifoldSolid::OwnDump S << "Orientation does not agrees with the underlying surface\n"; S << "Void shells :\nOrientation flags : "; IGESData_DumpEntities(S,dumper,-level,1, ent->NbVoidShells(),ent->VoidShell); - S << std::endl; + S << '\n'; if (level > 4) { S << "[\n"; @@ -236,6 +236,6 @@ void IGESSolid_ToolManifoldSolid::OwnDump } S << " ]\n"; } - S << std::endl; + S << '\n'; } diff --git a/src/IGESSolid/IGESSolid_ToolPlaneSurface.cxx b/src/IGESSolid/IGESSolid_ToolPlaneSurface.cxx index 10a7253c2f..c372d3a949 100644 --- a/src/IGESSolid/IGESSolid_ToolPlaneSurface.cxx +++ b/src/IGESSolid/IGESSolid_ToolPlaneSurface.cxx @@ -267,7 +267,7 @@ void IGESSolid_ToolPlaneSurface::OwnDump(const Handle(IGESSolid_PlaneSurface)& e { S << "Surface is Parametrised - Reference direction : "; dumper.Dump(ent->ReferenceDir(),S, sublevel); - S << std::endl; + S << '\n'; } - else S << "Surface is UnParametrised" << std::endl; + else S << "Surface is UnParametrised" << '\n'; } diff --git a/src/IGESSolid/IGESSolid_ToolRightAngularWedge.cxx b/src/IGESSolid/IGESSolid_ToolRightAngularWedge.cxx index 3c8552e0b9..92c2e241e9 100644 --- a/src/IGESSolid/IGESSolid_ToolRightAngularWedge.cxx +++ b/src/IGESSolid/IGESSolid_ToolRightAngularWedge.cxx @@ -205,5 +205,5 @@ void IGESSolid_ToolRightAngularWedge::OwnDump IGESData_DumpXYZL(S,level, ent->XAxis(), ent->VectorLocation()); S << "\nZAxis : "; IGESData_DumpXYZL(S,level, ent->ZAxis(), ent->VectorLocation()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESSolid/IGESSolid_ToolSelectedComponent.cxx b/src/IGESSolid/IGESSolid_ToolSelectedComponent.cxx index 2330610baa..7820cbbfd3 100644 --- a/src/IGESSolid/IGESSolid_ToolSelectedComponent.cxx +++ b/src/IGESSolid/IGESSolid_ToolSelectedComponent.cxx @@ -113,5 +113,5 @@ void IGESSolid_ToolSelectedComponent::OwnDump dumper.Dump(ent->Component(),S, (level <= 4) ? 0 : 1); S << "Selected Point : "; IGESData_DumpXYZL(S,level, ent->SelectPoint(), ent->Location()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESSolid/IGESSolid_ToolShell.cxx b/src/IGESSolid/IGESSolid_ToolShell.cxx index 598aff6743..66c4e4884b 100644 --- a/src/IGESSolid/IGESSolid_ToolShell.cxx +++ b/src/IGESSolid/IGESSolid_ToolShell.cxx @@ -247,5 +247,5 @@ void IGESSolid_ToolShell::OwnDump(const Handle(IGESSolid_Shell)& ent, else S << "False\n"; } } - S << std::endl; + S << '\n'; } diff --git a/src/IGESSolid/IGESSolid_ToolSolidAssembly.cxx b/src/IGESSolid/IGESSolid_ToolSolidAssembly.cxx index a1e3c2d112..076a263335 100644 --- a/src/IGESSolid/IGESSolid_ToolSolidAssembly.cxx +++ b/src/IGESSolid/IGESSolid_ToolSolidAssembly.cxx @@ -159,5 +159,5 @@ void IGESSolid_ToolSolidAssembly::OwnDump S << "\n" << "Matrices : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbItems(),ent->TransfMatrix); - S << std::endl; + S << '\n'; } diff --git a/src/IGESSolid/IGESSolid_ToolSolidInstance.cxx b/src/IGESSolid/IGESSolid_ToolSolidInstance.cxx index 627cbbf372..389aa57a76 100644 --- a/src/IGESSolid/IGESSolid_ToolSolidInstance.cxx +++ b/src/IGESSolid/IGESSolid_ToolSolidInstance.cxx @@ -92,5 +92,5 @@ void IGESSolid_ToolSolidInstance::OwnDump S << "IGESSolid_SolidInstance\n" << "Solid entity : "; dumper.Dump(ent->Entity(),S, (level <= 4) ? 0 : 1); - S << std::endl; + S << '\n'; } diff --git a/src/IGESSolid/IGESSolid_ToolSolidOfLinearExtrusion.cxx b/src/IGESSolid/IGESSolid_ToolSolidOfLinearExtrusion.cxx index b661581a4e..3385c2a20a 100644 --- a/src/IGESSolid/IGESSolid_ToolSolidOfLinearExtrusion.cxx +++ b/src/IGESSolid/IGESSolid_ToolSolidOfLinearExtrusion.cxx @@ -142,5 +142,5 @@ void IGESSolid_ToolSolidOfLinearExtrusion::OwnDump << "Extrusion length : " << ent->ExtrusionLength() << "\n" << "Extrusion direction : "; IGESData_DumpXYZL(S,level, ent->ExtrusionDirection(), ent->VectorLocation()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESSolid/IGESSolid_ToolSolidOfRevolution.cxx b/src/IGESSolid/IGESSolid_ToolSolidOfRevolution.cxx index a04d775153..232686ed7f 100644 --- a/src/IGESSolid/IGESSolid_ToolSolidOfRevolution.cxx +++ b/src/IGESSolid/IGESSolid_ToolSolidOfRevolution.cxx @@ -176,5 +176,5 @@ void IGESSolid_ToolSolidOfRevolution::OwnDump IGESData_DumpXYZL(S,level, ent->AxisPoint(), ent->Location()); S << "\nAxis direction : "; IGESData_DumpXYZL(S,level, ent->Axis(), ent->VectorLocation()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESSolid/IGESSolid_ToolSphere.cxx b/src/IGESSolid/IGESSolid_ToolSphere.cxx index 2fbe8c5de6..d67ef5b316 100644 --- a/src/IGESSolid/IGESSolid_ToolSphere.cxx +++ b/src/IGESSolid/IGESSolid_ToolSphere.cxx @@ -125,5 +125,5 @@ void IGESSolid_ToolSphere::OwnDump << "Radius : " << ent->Radius() << "\n" << "Center : "; IGESData_DumpXYZL(S,level, ent->Center(), ent->Location()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESSolid/IGESSolid_ToolSphericalSurface.cxx b/src/IGESSolid/IGESSolid_ToolSphericalSurface.cxx index e66c9cf1aa..0da43d534a 100644 --- a/src/IGESSolid/IGESSolid_ToolSphericalSurface.cxx +++ b/src/IGESSolid/IGESSolid_ToolSphericalSurface.cxx @@ -155,7 +155,7 @@ void IGESSolid_ToolSphericalSurface::OwnDump S << "\n" << "Reference direction : "; dumper.Dump(ent->ReferenceDir(),S, sublevel); - S << std::endl; + S << '\n'; } - else S << "Surface is UnParametrised" << std::endl; + else S << "Surface is UnParametrised" << '\n'; } diff --git a/src/IGESSolid/IGESSolid_ToolToroidalSurface.cxx b/src/IGESSolid/IGESSolid_ToolToroidalSurface.cxx index e77dd3576d..a083199541 100644 --- a/src/IGESSolid/IGESSolid_ToolToroidalSurface.cxx +++ b/src/IGESSolid/IGESSolid_ToolToroidalSurface.cxx @@ -152,7 +152,7 @@ void IGESSolid_ToolToroidalSurface::OwnDump { S << "Surface is Parametrised - Reference direction : "; dumper.Dump(ent->ReferenceDir(),S, sublevel); - S << std::endl; + S << '\n'; } - else S << "Surface is UnParametrised" << std::endl; + else S << "Surface is UnParametrised" << '\n'; } diff --git a/src/IGESSolid/IGESSolid_ToolTorus.cxx b/src/IGESSolid/IGESSolid_ToolTorus.cxx index 5657abfe84..44a05b6bae 100644 --- a/src/IGESSolid/IGESSolid_ToolTorus.cxx +++ b/src/IGESSolid/IGESSolid_ToolTorus.cxx @@ -167,5 +167,5 @@ void IGESSolid_ToolTorus::OwnDump IGESData_DumpXYZL(S,level, ent->AxisPoint(), ent->Location()); S << "\nAxis direction : "; IGESData_DumpXYZL(S,level, ent->Axis(), ent->VectorLocation()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESSolid/IGESSolid_ToolVertexList.cxx b/src/IGESSolid/IGESSolid_ToolVertexList.cxx index 7a49f50ea2..5182a16377 100644 --- a/src/IGESSolid/IGESSolid_ToolVertexList.cxx +++ b/src/IGESSolid/IGESSolid_ToolVertexList.cxx @@ -204,5 +204,5 @@ void IGESSolid_ToolVertexList::OwnDump(const Handle(IGESSolid_VertexList)& ent, S << "IGESSolid_VertexList\n" << "Vertices : "; IGESData_DumpListXYZL(S,level,1, ent->NbVertices(),ent->Vertex,ent->Location()); - S << std::endl; + S << '\n'; } diff --git a/src/IGESToBRep/IGESToBRep_CurveAndSurface.cxx b/src/IGESToBRep/IGESToBRep_CurveAndSurface.cxx index 1f55f60088..d1d1839fee 100644 --- a/src/IGESToBRep/IGESToBRep_CurveAndSurface.cxx +++ b/src/IGESToBRep/IGESToBRep_CurveAndSurface.cxx @@ -162,7 +162,7 @@ void IGESToBRep_CurveAndSurface::SetModel(const Handle(IGESData_IGESModel)& mode if (unitfactor != 1.) { if ( myTP->TraceLevel() > 2 ) - myTP->Messenger()->SendInfo() << "UnitFactor = "<< unitfactor << std::endl; + myTP->Messenger()->SendInfo() << "UnitFactor = "<< unitfactor << '\n'; myUnitFactor = unitfactor; } UpdateMinMaxTol(); diff --git a/src/IntAna/IntAna_IntQuadQuad.cxx b/src/IntAna/IntAna_IntQuadQuad.cxx index 20fb88e65d..4a5e50d205 100644 --- a/src/IntAna/IntAna_IntQuadQuad.cxx +++ b/src/IntAna/IntAna_IntQuadQuad.cxx @@ -1244,7 +1244,7 @@ void IntAna_IntQuadQuad::Parameters (const Standard_Integer, //i, Standard_Real& , Standard_Real& ) const { - std::cout << "IntAna_IntQuadQuad::Parameters(...) is not yet implemented" << std::endl; + std::cout << "IntAna_IntQuadQuad::Parameters(...) is not yet implemented" << '\n'; } /********************************************************************************* diff --git a/src/IntAna2d/IntAna2d_AnaIntersection_5.cxx b/src/IntAna2d/IntAna2d_AnaIntersection_5.cxx index 5fc58732b8..f1d8783dbc 100644 --- a/src/IntAna2d/IntAna2d_AnaIntersection_5.cxx +++ b/src/IntAna2d/IntAna2d_AnaIntersection_5.cxx @@ -56,7 +56,7 @@ void IntAna2d_AnaIntersection::Perform(const gp_Circ2d& Circle, math_TrigonometricFunctionRoots Sol(pcc,p2sc,pc,ps,pcte,0.0,2.0*M_PI); if(!Sol.IsDone()) { - std::cout << "\n\nmath_TrigonometricFunctionRoots -> NotDone\n\n"< NotDone\n\n"<<'\n'; done=Standard_False; return; } diff --git a/src/IntCurveSurface/IntCurveSurface_Intersection.cxx b/src/IntCurveSurface/IntCurveSurface_Intersection.cxx index 62e6b30c74..3cdc76c4d6 100644 --- a/src/IntCurveSurface/IntCurveSurface_Intersection.cxx +++ b/src/IntCurveSurface/IntCurveSurface_Intersection.cxx @@ -136,6 +136,6 @@ void IntCurveSurface_Intersection::Dump() const { for(i=1;i<=ni;i++) { Segment(i).Dump(); } } else { - std::cout<<" Intersection NotDone"< void IntPatch_Point::Dump() const { - std::cout<<"----------- IntPatch_Point : "< IntSurf_PntOn2S : "<< polr <<", Pnt (" << Vertex(pol).Value().X() << "," << Vertex(pol).Value().Y() << "," << - Vertex(pol).Value().Z() <<")" < IntSurf_PntOn2S : "<< polr <<", Pnt (" << Vertex(pol).Value().X() << "," << Vertex(pol).Value().Y() << "," << - Vertex(pol).Value().Z() <<")" < 0 ? mesnum1 : mesnum2); - if (!titre) S <<" ** " << Name() << " **"< 9 && i < 10) S <<" "; if (nb > 99 && i < 100) S <<" "; S <Print (ent, S); } @@ -551,10 +551,10 @@ void Interface_CheckIterator::Print(Standard_OStream& S, // S<<" -- Entity n0 "<PrintLabel(ent,S); } - if (num >= 0 && entnul) S <<" (unknown Type)"<= 0 && entnul) S <<" (unknown Type)"<<'\n'; else if (num >= 0 && !entnul) { - if (yamod) S <<" Type:"<TypeName(ent)<DynamicType()->Name()<TypeName(ent)<<'\n'; + else S <<" Type:"<DynamicType()->Name()<<'\n'; } ach->Print (S, (failsonly ? 1 : 3)); diff --git a/src/Interface/Interface_MSG.cxx b/src/Interface/Interface_MSG.cxx index bbd0229490..f638cf3096 100644 --- a/src/Interface/Interface_MSG.cxx +++ b/src/Interface/Interface_MSG.cxx @@ -153,7 +153,7 @@ Standard_Integer Interface_MSG::Read (Standard_IStream& S) { Standard_Integer nb = 0; if (thedic.IsEmpty()) return nb; - if (rootkey[0] != '\0') S<<"@@ ROOT:"<::Iterator iter(thedic); for (; iter.More(); iter.Next()) { if (!iter.Key().StartsWith(rootkey)) continue; @@ -184,7 +184,7 @@ Standard_CString Interface_MSG::Translated (const Standard_CString key) if (thedic.Find(key, str)) return str->ToCString(); } - if (theprint) std::cout<<" ** Interface_MSG:Translate ?? "<Value(2*i-1); S<<"** DUP:"<ToCString(); dup = thedup->Value(2*i); - S<<" ** "<ToCString()<ToCString()<<'\n'; } if (thelist.IsEmpty()) return; NCollection_DataMap::Iterator iter(thelist); for (; iter.More(); iter.Next()) { - S<<"** MSG(NB="<Print (ent, S); } - S <Name()<Name()<<'\n'; S <<"--- Actual status : "<<(theupdate ? "" : "original")<<" Value : "; - if (thesatisf) S <<" -- Specific Function for Satisfies : "<= 2" << std::endl; + std::cout << "Not yet implemented : nbwire >= 2" << '\n'; } } diff --git a/src/LocOpe/LocOpe_SplitShape.cxx b/src/LocOpe/LocOpe_SplitShape.cxx index 72ed0729f5..e1ebd17712 100644 --- a/src/LocOpe/LocOpe_SplitShape.cxx +++ b/src/LocOpe/LocOpe_SplitShape.cxx @@ -951,7 +951,7 @@ Standard_Boolean LocOpe_SplitShape::AddOpenWire(const TopoDS_Wire& W, } //MODIFICATION PIERRE SMEYERS : si pas de possibilite, on sort avec erreur else{ - std::cout<<"erreur Spliter : pas de chainage du wire"<EdgeNumber()<EdgeNumber()<<'\n'; for(i=0; iEdgeNumber()<EdgeNumber()<<'\n'; for(i=0; iMore()) { - std::cout<<" Bisectors List : "<Dump(ashift+1,1); } } - std::cout<NbLinks(); - std::cout << "nblink=" << nbLinks << std::endl; + std::cout << "nblink=" << nbLinks << '\n'; TCollection_AsciiString aName(theNameStr); for (Standard_Integer i = 1; i <= nbLinks; i++) { @@ -79,7 +79,7 @@ Standard_EXPORT const char* MeshTest_DrawTriangles(const char* theNameStr, void* if (aMeshData.IsNull()) return "Null mesh data structure"; Standard_Integer nbElem = aMeshData->NbElements(); - std::cout << "nbelem=" << nbElem << std::endl; + std::cout << "nbelem=" << nbElem << '\n'; TCollection_AsciiString aName(theNameStr); for (Standard_Integer i = 1; i <= nbElem; i++) { diff --git a/src/MeshTest/MeshTest_PluginCommands.cxx b/src/MeshTest/MeshTest_PluginCommands.cxx index 9215217e50..a62d002312 100644 --- a/src/MeshTest/MeshTest_PluginCommands.cxx +++ b/src/MeshTest/MeshTest_PluginCommands.cxx @@ -296,7 +296,7 @@ static Standard_Integer triarea (Draw_Interpretor& di, int n, const char ** a) TopLoc_Location aLoc; Handle(Poly_Triangulation) aPoly = BRep_Tool::Triangulation(aFace,aLoc); if (aPoly.IsNull()) { - std::cout << "face "<NbTriangles(); j++) diff --git a/src/Message/Message_PrinterOStream.cxx b/src/Message/Message_PrinterOStream.cxx index ee53f8187a..8e4cab65fd 100644 --- a/src/Message/Message_PrinterOStream.cxx +++ b/src/Message/Message_PrinterOStream.cxx @@ -161,7 +161,7 @@ void Message_PrinterOStream::send (const TCollection_AsciiString& theString, { *aStream << theString; } - (*aStream) << std::endl; + (*aStream) << '\n'; } //======================================================================= diff --git a/src/Message/Message_Report.cxx b/src/Message/Message_Report.cxx index 9f606f7448..9249e36cee 100644 --- a/src/Message/Message_Report.cxx +++ b/src/Message/Message_Report.cxx @@ -458,7 +458,7 @@ void Message_Report::dumpMessages (Standard_OStream& theOS, Message_Gravity theG const Message_ListOfAlert& anAlerts = theCompositeAlert->Alerts (theGravity); for (Message_ListOfAlert::Iterator anIt (anAlerts); anIt.More(); anIt.Next()) { - theOS << anIt.Value()->GetMessageKey() << std::endl; + theOS << anIt.Value()->GetMessageKey() << '\n'; Handle(Message_AlertExtended) anExtendedAlert = Handle(Message_AlertExtended)::DownCast (anIt.Value()); if (anExtendedAlert.IsNull()) diff --git a/src/MoniTool/MoniTool_Timer.cxx b/src/MoniTool/MoniTool_Timer.cxx index fb7021f935..b89d6bc73c 100644 --- a/src/MoniTool/MoniTool_Timer.cxx +++ b/src/MoniTool/MoniTool_Timer.cxx @@ -40,7 +40,7 @@ void MoniTool_Timer::Dump(Standard_OStream &ostr) Sprintf ( buff, "Elapsed:%6.1f sec, CPU User:%9.4f sec, CPU Sys:%9.4f sec, hits: %d", elapsed, user, system, myCount ); - ostr << buff << std::endl; + ostr << buff << '\n'; } //======================================================================= @@ -93,7 +93,7 @@ void MoniTool_Timer::DumpTimers (Standard_OStream &ostr) Standard_Integer NbTimers = dic.Extent(); - ostr << "DUMP OF TIMERS:" << std::endl; + ostr << "DUMP OF TIMERS:" << '\n'; Standard_CString *keys = new Standard_CString[NbTimers]; Standard_Integer i=0; for( ; iter.More() && i < NbTimers; iter.Next()) { @@ -115,7 +115,7 @@ void MoniTool_Timer::DumpTimers (Standard_OStream &ostr) //iter.Value()->Dump ( ostr ); Timer(stmp)->Dump(ostr); keys[ntmp]=0; - if ( Timer(stmp)->IsRunning() ) std::cerr << "Warning: timer " << stmp << " is running" << std::endl; + if ( Timer(stmp)->IsRunning() ) std::cerr << "Warning: timer " << stmp << " is running" << '\n'; } delete[] keys; } @@ -194,12 +194,12 @@ void MoniTool_Timer::ComputeAmendments () amAccess += ( 0.5 * ( cpu3 - cpu1 ) ) / NBTESTS; amError = Abs ( cpu1 + cpu3 - 2 * cpu2 ) / NBTESTS; - std::cout << "CPU 0: " << cpu0 << std::endl; - std::cout << "CPU 1: " << cpu1 << " INTERNAL: " << cput1 << std::endl; - std::cout << "CPU 2: " << cpu2 << " INTERNAL: " << cput2 << std::endl; - std::cout << "CPU 3: " << cpu3 << " INTERNAL: " << cput3 << std::endl; + std::cout << "CPU 0: " << cpu0 << '\n'; + std::cout << "CPU 1: " << cpu1 << " INTERNAL: " << cput1 << '\n'; + std::cout << "CPU 2: " << cpu2 << " INTERNAL: " << cput2 << '\n'; + std::cout << "CPU 3: " << cpu3 << " INTERNAL: " << cput3 << '\n'; std::cout << "Access: " << amAccess << ", External: " << amExternal << - ", Internal: " << amInternal << ", Error: " << amError << std::endl; + ", Internal: " << amInternal << ", Error: " << amError << '\n'; } diff --git a/src/MoniTool/MoniTool_TypedValue.cxx b/src/MoniTool/MoniTool_TypedValue.cxx index f6e7b7534f..d3e0aaf41f 100644 --- a/src/MoniTool/MoniTool_TypedValue.cxx +++ b/src/MoniTool/MoniTool_TypedValue.cxx @@ -232,12 +232,12 @@ static Standard_Boolean StaticPath(const Handle(TCollection_HAsciiString)& val) { S <<"--- Typed Value : "< 0) S <<" Label : "<::const_iterator it = aStMap.begin(); @@ -386,7 +386,7 @@ Standard_Boolean OSD_MAllocHook::LogFileHandler::MakeReport << std::setw(10) << aInfo.nbLeftPeak << ' ' << std::setw(20) << aSizeAlloc << ' ' << std::setw(20) << aSizeLeft << ' ' - << std::setw(20) << aSizePeak << std::endl; + << std::setw(20) << aSizePeak << '\n'; if (aTotAlloc + aSizeAlloc < aTotAlloc) // overflow ? aTotAlloc = SIZE_MAX; @@ -406,7 +406,7 @@ Standard_Boolean OSD_MAllocHook::LogFileHandler::MakeReport << (aTotAlloc == SIZE_MAX ? '>' : ' ') << std::setw(20) << aTotAlloc << ' ' << std::setw(20) << aTotalLeftSize << ' ' - << std::setw(20) << aTotalPeakSize << std::endl; + << std::setw(20) << aTotalPeakSize << '\n'; aRepFile.close(); return Standard_True; @@ -425,7 +425,7 @@ void OSD_MAllocHook::LogFileHandler::AllocEvent { myMutex.Lock(); myLogFile << "alloc "<< std::setw(10) << theRequestNum - << std::setw(20) << theSize << std::endl; + << std::setw(20) << theSize << '\n'; if (myBreakSize == theSize) place_for_breakpoint(); myMutex.Unlock(); @@ -446,7 +446,7 @@ void OSD_MAllocHook::LogFileHandler::FreeEvent { myMutex.Lock(); myLogFile << "free " << std::setw(20) << theRequestNum - << std::setw(20) << theSize << std::endl; + << std::setw(20) << theSize << '\n'; myMutex.Unlock(); } } @@ -524,7 +524,7 @@ Standard_Boolean OSD_MAllocHook::CollectBySize::MakeReport(const char* theOutFil << std::setw(10) << "NbLeftPeak " << std::setw(20) << "AllocSize " << std::setw(20) << "LeftSize " - << std::setw(20) << "PeakSize " << std::endl; + << std::setw(20) << "PeakSize " << '\n'; Standard_Size aTotAlloc = 0; for (int i = 0; i < MAX_ALLOC_SIZE; i++) @@ -543,7 +543,7 @@ Standard_Boolean OSD_MAllocHook::CollectBySize::MakeReport(const char* theOutFil << std::setw(10) << myArray[i].nbLeftPeak << ' ' << std::setw(20) << aSizeAlloc << ' ' << std::setw(20) << aSizeLeft << ' ' - << std::setw(20) << aSizePeak << std::endl; + << std::setw(20) << aSizePeak << '\n'; if (aTotAlloc + aSizeAlloc < aTotAlloc) // overflow ? aTotAlloc = SIZE_MAX; @@ -558,7 +558,7 @@ Standard_Boolean OSD_MAllocHook::CollectBySize::MakeReport(const char* theOutFil << (aTotAlloc == SIZE_MAX ? '>' : ' ') << std::setw(20) << aTotAlloc << ' ' << std::setw(20) << myTotalLeftSize << ' ' - << std::setw(20) << myTotalPeakSize << std::endl; + << std::setw(20) << myTotalPeakSize << '\n'; aRepFile.close(); return Standard_True; } diff --git a/src/OSD/OSD_signal.cxx b/src/OSD/OSD_signal.cxx index 7da3f19004..32a2e428aa 100644 --- a/src/OSD/OSD_signal.cxx +++ b/src/OSD/OSD_signal.cxx @@ -1089,7 +1089,7 @@ void OSD::SetSignal (OSD_SignalMode theSignalMode, sigemptyset(&anActOld2.sa_mask); retcode = sigaction (aSignalTypes[i], &anActOld, &anActOld2); } - Standard_ASSERT(retcode == 0, "sigaction() failed", std::cout << "OSD::SetSignal(): sigaction() failed for " << aSignalTypes[i] << std::endl); + Standard_ASSERT(retcode == 0, "sigaction() failed", std::cout << "OSD::SetSignal(): sigaction() failed for " << aSignalTypes[i] << '\n'); } } diff --git a/src/Plugin/Plugin.cxx b/src/Plugin/Plugin.cxx index 6ad8b23451..21a8fc2f53 100644 --- a/src/Plugin/Plugin.cxx +++ b/src/Plugin/Plugin.cxx @@ -51,9 +51,9 @@ Handle(Standard_Transient) Plugin::Load (const Standard_GUID& aGUID, if(!PluginResource->Find(theResource.ToCString())) { Standard_SStream aMsg; aMsg << "could not find the resource:"; - aMsg << theResource.ToCString() << std::endl; + aMsg << theResource.ToCString() << '\n'; if (theVerbose) - std::cout << "could not find the resource:" << theResource.ToCString() << std::endl; + std::cout << "could not find the resource:" << theResource.ToCString() << '\n'; throw Plugin_Failure(aMsg.str().c_str()); } @@ -79,7 +79,7 @@ Handle(Standard_Transient) Plugin::Load (const Standard_GUID& aGUID, aMsg << "; reason:"; aMsg << error.ToCString(); if (theVerbose) - std::cout << "could not open: " << PluginResource->Value(theResource.ToCString())<< " ; reason: "<< error.ToCString() << std::endl; + std::cout << "could not open: " << PluginResource->Value(theResource.ToCString())<< " ; reason: "<< error.ToCString() << '\n'; throw Plugin_Failure(aMsg.str().c_str()); } f = theSharedLibrary.DlSymb("PLUGINFACTORY"); diff --git a/src/Poly/Poly_CoherentNode.cxx b/src/Poly/Poly_CoherentNode.cxx index d84265646a..1b669f3e82 100644 --- a/src/Poly/Poly_CoherentNode.cxx +++ b/src/Poly/Poly_CoherentNode.cxx @@ -99,11 +99,11 @@ void Poly_CoherentNode::Dump(Standard_OStream& theStream) const { char buf[256]; Sprintf (buf, " X =%9.4f; Y =%9.4f; Z =%9.4f", X(), Y(), Z()); - theStream << buf << std::endl; + theStream << buf << '\n'; Poly_CoherentTriPtr::Iterator anIter(* myTriangles); for (; anIter.More(); anIter.Next()) { const Poly_CoherentTriangle& aTri = anIter.Value(); Sprintf (buf, " %5d %5d %5d", aTri.Node(0),aTri.Node(1),aTri.Node(2)); - theStream << buf << std::endl; + theStream << buf << '\n'; } } diff --git a/src/ProjLib/ProjLib_ProjectOnSurface.cxx b/src/ProjLib/ProjLib_ProjectOnSurface.cxx index de4cf1f20a..17a8f20d55 100644 --- a/src/ProjLib/ProjLib_ProjectOnSurface.cxx +++ b/src/ProjLib/ProjLib_ProjectOnSurface.cxx @@ -50,7 +50,7 @@ static gp_Pnt OnSurface_Value(const Standard_Real U, } } if ( Index == 0 ) { - std::cout << " Extrema non trouve pour U = " << U << std::endl; + std::cout << " Extrema non trouve pour U = " << U << '\n'; return gp_Pnt(0.,0.,0.); } else { diff --git a/src/QABugs/QABugs_11.cxx b/src/QABugs/QABugs_11.cxx index e84883a962..bb1966975e 100644 --- a/src/QABugs/QABugs_11.cxx +++ b/src/QABugs/QABugs_11.cxx @@ -1491,7 +1491,7 @@ static Standard_Integer OCC670 (Draw_Interpretor& di, Standard_Integer argc, con } catch (Standard_Failure const& anException) { std::cout << "Caught successfully: "; - std::cout << anException << std::endl; + std::cout << anException << '\n'; } return 0; } @@ -2121,7 +2121,7 @@ static Standard_Integer OCC6143 (Draw_Interpretor& di, Standard_Integer argc, co {//==== Test Divide ByZero (Integer) ======================================== try{ OCC_CATCH_SIGNALS - std::cout << "(Integer) Divide By Zero..." << std::endl; + std::cout << "(Integer) Divide By Zero..." << '\n'; di << "(Integer) Divide By Zero..."; //std::cout.flush(); di << "\n"; @@ -2154,7 +2154,7 @@ static Standard_Integer OCC6143 (Draw_Interpretor& di, Standard_Integer argc, co {//==== Test Divide ByZero (Real) =========================================== try{ OCC_CATCH_SIGNALS - std::cout << "(Real) Divide By Zero..." << std::endl; + std::cout << "(Real) Divide By Zero..." << '\n'; di << "(Real) Divide By Zero..."; //std::cout.flush(); di << "\n"; @@ -2183,7 +2183,7 @@ static Standard_Integer OCC6143 (Draw_Interpretor& di, Standard_Integer argc, co {//==== Test Overflow (Integer) ============================================= try{ OCC_CATCH_SIGNALS - std::cout << "(Integer) Overflow..." << std::endl; + std::cout << "(Integer) Overflow..." << '\n'; di << "(Integer) Overflow..."; //std::cout.flush(); di << "\n"; @@ -2208,7 +2208,7 @@ static Standard_Integer OCC6143 (Draw_Interpretor& di, Standard_Integer argc, co {//==== Test Overflow (Real) ================================================ try{ OCC_CATCH_SIGNALS - std::cout << "(Real) Overflow..." << std::endl; + std::cout << "(Real) Overflow..." << '\n'; di << "(Real) Overflow..."; //std::cout.flush(); di << "\n"; @@ -2240,7 +2240,7 @@ static Standard_Integer OCC6143 (Draw_Interpretor& di, Standard_Integer argc, co {//==== Test Underflow (Real) =============================================== try{ OCC_CATCH_SIGNALS - std::cout << "(Real) Underflow" << std::endl; // to have message in log even if process crashed + std::cout << "(Real) Underflow" << '\n'; // to have message in log even if process crashed di << "(Real) Underflow"; //std::cout.flush(); di << "\n"; @@ -2273,7 +2273,7 @@ static Standard_Integer OCC6143 (Draw_Interpretor& di, Standard_Integer argc, co {//==== Test Invalid Operation (Real) =============================================== try{ OCC_CATCH_SIGNALS - std::cout << "(Real) Invalid Operation..." << std::endl; + std::cout << "(Real) Invalid Operation..." << '\n'; di << "(Real) Invalid Operation..."; //std::cout.flush(); di << "\n"; @@ -2297,7 +2297,7 @@ static Standard_Integer OCC6143 (Draw_Interpretor& di, Standard_Integer argc, co {//==== Test Access Violation =============================================== try { OCC_CATCH_SIGNALS - std::cout << "Segmentation Fault..." << std::endl; + std::cout << "Segmentation Fault..." << '\n'; di << "Segmentation Fault..."; //std::cout.flush(); di << "\n"; @@ -2714,10 +2714,10 @@ static Standard_Integer OCC10138 (Draw_Interpretor& di, Standard_Integer argc, c Handle(TDataStd_RealArray) array; if (label1.FindAttribute(TDataStd_RealArray::GetID(), array) && array->Lower() == LOWER && array->Upper() == UPPER) - std::cout<<"1: OK"<CommitCommand(); @@ -2731,11 +2731,11 @@ static Standard_Integer OCC10138 (Draw_Interpretor& di, Standard_Integer argc, c { if (array->Value(i) != i) { - std::cout<<"2: Failed.."<CommitCommand(); //! 3. Re-init the array @@ -2743,7 +2743,7 @@ static Standard_Integer OCC10138 (Draw_Interpretor& di, Standard_Integer argc, c array->Init(LOWER + 2, UPPER + 4); if (array->Lower() != LOWER + 2 && array->Upper() != UPPER + 4) { - std::cout<<"3: Failed.."<Value(i) != i) { - std::cout<<"3: Failed.."<CommitCommand(); //! 4. Change array @@ -2769,11 +2769,11 @@ static Standard_Integer OCC10138 (Draw_Interpretor& di, Standard_Integer argc, c { if (array->Value(i) != i) { - std::cout<<"4: Failed.."<CommitCommand(); //! 5. Copy the array @@ -2782,24 +2782,24 @@ static Standard_Integer OCC10138 (Draw_Interpretor& di, Standard_Integer argc, c copier.Perform(); if (!copier.IsDone()) { - std::cout<<"5: Failed.."<Value(i) != i) { - std::cout<<"5: Failed.."<CommitCommand(); //! 6. Undo/Redo @@ -2808,7 +2808,7 @@ static Standard_Integer OCC10138 (Draw_Interpretor& di, Standard_Integer argc, c if (!label1.FindAttribute(TDataStd_RealArray::GetID(), array) || label2.FindAttribute(TDataStd_RealArray::GetID(), array2)) { - std::cout<<"6.a: Failed.."<Lower() != LOWER + 2 || array->Upper() != UPPER + 4) { - std::cout<<"6.b: Failed.."<Value(i) != i) { - std::cout<<"6.b: Failed.."<Lower() != LOWER || array->Upper() != UPPER) { - std::cout<<"6.c: Failed.."<Value(i) != i) { - std::cout<<"6.c: Failed.."<Lower() != LOWER || array->Upper() != UPPER) { - std::cout<<"6.d: Failed.."<Value(i) != i) { - std::cout<<"6.d: Failed.."<OpenCommand(); array = TDataStd_RealArray::Set(label1, LOWER + 1, UPPER + 1); if (array->Lower() != LOWER + 1 && array->Upper() != UPPER + 1) { - std::cout<<"7: Failed.."<Value(i) != i) { - std::cout<<"7: Failed.."<CommitCommand(); //! 8.Test of speed: set LOWER and UPPER equal to great integer number and @@ -2973,16 +2973,16 @@ static Standard_Integer OCC8797 (Draw_Interpretor& di, Standard_Integer argc, co GeomAdaptor_Curve adaptor_spline(spline); GCPnts_AbscissaPoint temp; l_abcissa=temp.Length(adaptor_spline); - std::cout<<"Length Spline(abcissa_Pnt): "<GProp_GProps): "<GProp_GProps): "<Send ("Direct message 1"); - aSender << "... end" << std::endl; // endl should send the message + aSender << "... end" << '\n'; // endl should send the message // check that empty stream buffer does not produce output on destruction Message::SendInfo(); @@ -4815,7 +4815,7 @@ Standard_Integer OCC31189 (Draw_Interpretor& theDI, Standard_Integer /*argc*/, c aMsgMgr->Send ("Direct message 2"); // check that empty stream buffer does produce empty line if std::endl is passed - Message::SendInfo() << std::endl; + Message::SendInfo() << '\n'; // last message should be sent on destruction of a sender aSender << "Sender message 2"; diff --git a/src/QABugs/QABugs_19.cxx b/src/QABugs/QABugs_19.cxx index c6f3d91c0e..212ef5ef07 100644 --- a/src/QABugs/QABugs_19.cxx +++ b/src/QABugs/QABugs_19.cxx @@ -403,23 +403,23 @@ static Standard_Address GeomConvertTest (Standard_Address data) GeomConvert_ApproxSurface aGAS (info->surf, 1e-4, GeomAbs_C1, GeomAbs_C1, 9, 9, 100, 1); if (!aGAS.IsDone()) { - std::cout << "Error: ApproxSurface is not done!" << std::endl; + std::cout << "Error: ApproxSurface is not done!" << '\n'; return 0; } const Handle(Geom_BSplineSurface)& aBSurf = aGAS.Surface(); if (aBSurf.IsNull()) { - std::cout << "Error: BSplineSurface is not created!" << std::endl; + std::cout << "Error: BSplineSurface is not created!" << '\n'; return 0; } std::cout << "Number of UPoles:" << aBSurf->NbUPoles(); if (aBSurf->NbUPoles() == info->nbupoles) { - std::cout << ": OK" << std::endl; + std::cout << ": OK" << '\n'; return data; // any non-null pointer } else { - std::cout << ": Error, must be " << info->nbupoles << std::endl; + std::cout << ": Error, must be " << info->nbupoles << '\n'; return 0; } } @@ -427,7 +427,7 @@ static Standard_Address GeomConvertTest (Standard_Address data) static Standard_Integer OCC23952sweep (Draw_Interpretor& di, Standard_Integer argc, const char ** argv) { if (argc != 3) { - std::cout << "Error: invalid number of arguments" << std::endl; + std::cout << "Error: invalid number of arguments" << '\n'; return 1; } @@ -436,7 +436,7 @@ static Standard_Integer OCC23952sweep (Draw_Interpretor& di, Standard_Integer ar aStorage.surf = DrawTrSurf::GetSurface(argv[2]); if (aStorage.surf.IsNull()) { - std::cout << "Error: " << argv[2] << " is not a DRAW surface!" << std::endl; + std::cout << "Error: " << argv[2] << " is not a DRAW surface!" << '\n'; return 0; } @@ -476,19 +476,19 @@ static Standard_Address GeomIntSSTest (Standard_Address data) GeomInt_IntSS anInter; anInter.Perform (info->surf1, info->surf2, Precision::Confusion(), Standard_True); if (!anInter.IsDone()) { - std::cout << "An intersection is not done!" << std::endl; + std::cout << "An intersection is not done!" << '\n'; return 0; } std::cout << "Number of Lines:" << anInter.NbLines(); if (anInter.NbLines() == info->nbsol) { - std::cout << ": OK" << std::endl; + std::cout << ": OK" << '\n'; return data; // any non-null pointer } else { - std::cout << ": Error, must be " << info->nbsol << std::endl; + std::cout << ": Error, must be " << info->nbsol << '\n'; return 0; } } @@ -496,7 +496,7 @@ static Standard_Address GeomIntSSTest (Standard_Address data) static Standard_Integer OCC23952intersect (Draw_Interpretor& di, Standard_Integer argc, const char ** argv) { if (argc != 4) { - std::cout << "Error: invalid number of arguments" << std::endl; + std::cout << "Error: invalid number of arguments" << '\n'; return 1; } @@ -506,7 +506,7 @@ static Standard_Integer OCC23952intersect (Draw_Interpretor& di, Standard_Intege aStorage.surf2 = DrawTrSurf::GetSurface(argv[3]); if (aStorage.surf1.IsNull() || aStorage.surf2.IsNull()) { - std::cout << "Error: Either " << argv[2] << " or " << argv[3] << " is not a DRAW surface!" << std::endl; + std::cout << "Error: Either " << argv[2] << " or " << argv[3] << " is not a DRAW surface!" << '\n'; return 0; } @@ -1360,12 +1360,12 @@ static Standard_Integer OCC24137 (Draw_Interpretor& theDI, Standard_Integer theN const Standard_Integer aNbIts = (anArgIter < theNArg) ? Draw::Atoi (theArgv[anArgIter++]) : 100; if (aShapeF.IsNull() || aShapeF.ShapeType() != TopAbs_FACE) { - std::cout << "Error: " << aFaceName << " shape is null / not a face" << std::endl; + std::cout << "Error: " << aFaceName << " shape is null / not a face" << '\n'; return 1; } if (aShapeV.IsNull() || aShapeV.ShapeType() != TopAbs_VERTEX) { - std::cout << "Error: " << aVertName << " shape is null / not a vertex" << std::endl; + std::cout << "Error: " << aVertName << " shape is null / not a vertex" << '\n'; return 1; } const TopoDS_Face aFace = TopoDS::Face (aShapeF); @@ -4434,7 +4434,7 @@ static Standard_Integer OCC24537( aF.open(argv[1]); if (!aF.is_open()) { - std::cout << "cannot create file " << argv[1] << std::endl; + std::cout << "cannot create file " << argv[1] << '\n'; return 1; } } @@ -4646,7 +4646,7 @@ static Standard_Integer OCC24537( theDI << "Conversion was done OK"; if (aF.is_open()) { - std::cout << "the file " << argv[1] << " has been created" << std::endl; + std::cout << "the file " << argv[1] << " has been created" << '\n'; aF.close(); } return 0; @@ -4891,7 +4891,7 @@ static Standard_Integer OCC27048(Draw_Interpretor& theDI, Standard_Integer theAr { if (theArgc != 5) { - std::cout << "Incorrect number of arguments. See usage:" << std::endl; + std::cout << "Incorrect number of arguments. See usage:" << '\n'; theDI.PrintHelp(theArgv[0]); return 1; } @@ -5053,7 +5053,7 @@ static Standard_Integer OCC27700 (Draw_Interpretor& /*theDI*/, Standard_Integer Handle(AIS_InteractiveContext) aContext = ViewerTest::GetAISContext(); if (aContext.IsNull()) { - std::cout << "Error: no view available, call 'vinit' before!" << std::endl; + std::cout << "Error: no view available, call 'vinit' before!" << '\n'; return 1; } Handle(OCC27700_Text) aPresentation = new OCC27700_Text(); @@ -5302,16 +5302,16 @@ static Standard_Integer OCC30492(Draw_Interpretor& /*theDI*/, math_FRPR aFRPR(aFunc, Precision::Confusion()); aFRPR.Perform(aFunc, aStartPnt); if (!aFRPR.IsDone()) - std::cout << "OCC30492: Error: FRPR optimization is not done." << std::endl; + std::cout << "OCC30492: Error: FRPR optimization is not done." << '\n'; else - std::cout << "OCC30492: OK: FRPR optimization is done." << std::endl; + std::cout << "OCC30492: OK: FRPR optimization is done." << '\n'; math_BFGS aBFGS(1, Precision::Confusion()); aBFGS.Perform(aFunc, aStartPnt); if (!aBFGS.IsDone()) - std::cout << "OCC30492: Error: BFGS optimization is not done." << std::endl; + std::cout << "OCC30492: Error: BFGS optimization is not done." << '\n'; else - std::cout << "OCC30492: OK: BFGS optimization is done." << std::endl; + std::cout << "OCC30492: OK: BFGS optimization is done." << '\n'; return 0; } diff --git a/src/QABugs/QABugs_20.cxx b/src/QABugs/QABugs_20.cxx index cd3769d074..273daf6edf 100644 --- a/src/QABugs/QABugs_20.cxx +++ b/src/QABugs/QABugs_20.cxx @@ -1414,7 +1414,7 @@ static Standard_Integer OCC27021(Draw_Interpretor& theDI, { if (theNArg != 2) { - std::cout << "Use: " << theArgVal[0] << " shape" << std::endl; + std::cout << "Use: " << theArgVal[0] << " shape" << '\n'; return 1; } @@ -1546,7 +1546,7 @@ static Standard_Integer OCC26930(Draw_Interpretor& theDI, { if (theNArg != 5) { - std::cout << "Use: " << theArgVal[0] <<" surface curve start end" << std::endl; + std::cout << "Use: " << theArgVal[0] <<" surface curve start end" << '\n'; return 1; } @@ -1598,7 +1598,7 @@ static Standard_Integer OCC27466(Draw_Interpretor& theDI, { if (theNArg != 4) { - std::cout << "Use: " << theArgVal[0] << " face point start_pnt2d" << std::endl; + std::cout << "Use: " << theArgVal[0] << " face point start_pnt2d" << '\n'; return 1; } @@ -2373,7 +2373,7 @@ static Standard_Integer OCC28784(Draw_Interpretor&, Standard_Integer argc, const static Standard_Integer OCC28829 (Draw_Interpretor&, Standard_Integer, const char**) { // do something that causes FPE exception - std::cout << "sqrt(-1) = " << sqrt (-1.) << std::endl; + std::cout << "sqrt(-1) = " << sqrt (-1.) << '\n'; return 0; } @@ -2473,7 +2473,7 @@ static Standard_Integer OCC28131 (Draw_Interpretor&, Standard_Integer theNbArgs, { if (theNbArgs != 2) { - std::cerr << "Error: wrong number of arguments" << std::endl; + std::cerr << "Error: wrong number of arguments" << '\n'; return 1; } @@ -2629,7 +2629,7 @@ Standard_Boolean IsSameGuid (const Standard_GUID& aGuidNull, const Standard_GUID isSame = Standard_True; } else { aGuid2.ShallowDump(std::cout); - std::cout < > (theDI, nbm1, nbm2); else { - std::cout << "Error: unrecognized argument " << theArgv[1] << std::endl; + std::cout << "Error: unrecognized argument " << theArgv[1] << '\n'; return 1; } return 0; @@ -3025,7 +3025,7 @@ static Standard_Integer OCC29311 (Draw_Interpretor& theDI, Standard_Integer theA { if (theArgc < 4) { - std::cerr << "Use: " << theArgv[0] << " shape counter_name nb_iterations" << std::endl; + std::cerr << "Use: " << theArgv[0] << " shape counter_name nb_iterations" << '\n'; return 1; } @@ -3268,7 +3268,7 @@ static Standard_Integer OCC29195(Draw_Interpretor&, Standard_Integer theArgC, co { std::cout << "\nOCC29195 [nbRep] doc1.cbf doc1.xml doc1.std outDoc1.cbf outDoc1.xml doc2.cbf doc2.xml doc2.std outDoc2.cbf outDoc2.xml ...], where:"; std::cout << "\nnbRep - number repetitions of a thread function (by default - 50)"; - std::cout << "\ndocN - names (5 in each group) of OCAF documents names (3 input files, 2 output)\n" << std::endl; + std::cout << "\ndocN - names (5 in each group) of OCAF documents names (3 input files, 2 output)\n" << '\n'; return 1; } int iThread(0), off(0); @@ -4277,9 +4277,9 @@ static Standard_Integer OCC33048(Draw_Interpretor&, Standard_Integer, const char } if (isOK) - std::cout << "OK: Kronrod points and weights are calculated successfully." << std::endl; + std::cout << "OK: Kronrod points and weights are calculated successfully." << '\n'; else - std::cout << "Error: Problem occurred during calculation of Kronrod points and weights." << std::endl; + std::cout << "Error: Problem occurred during calculation of Kronrod points and weights." << '\n'; return 0; } diff --git a/src/QABugs/QABugs_BVH.cxx b/src/QABugs/QABugs_BVH.cxx index 699e105a3f..c1f9fc8b87 100644 --- a/src/QABugs/QABugs_BVH.cxx +++ b/src/QABugs/QABugs_BVH.cxx @@ -184,7 +184,7 @@ static Standard_Integer QABVH_ShapeSelect (Draw_Interpretor& theDI, TopoDS_Shape aShape = DBRep::Get (theArgv [2]); if (aShape.IsNull()) { - std::cout << theArgv[2] << " does not exist" << std::endl; + std::cout << theArgv[2] << " does not exist" << '\n'; return 1; } @@ -192,7 +192,7 @@ static Standard_Integer QABVH_ShapeSelect (Draw_Interpretor& theDI, TopoDS_Shape aBShape = DBRep::Get (theArgv [3]); if (aBShape.IsNull()) { - std::cout << theArgv[3] << " does not exist" << std::endl; + std::cout << theArgv[3] << " does not exist" << '\n'; return 1; } @@ -390,7 +390,7 @@ static Standard_Integer QABVH_PairSelect (Draw_Interpretor& theDI, aShape[0] = DBRep::Get (theArgv [2]); if (aShape[0].IsNull()) { - std::cout << theArgv[2] << " does not exist" << std::endl; + std::cout << theArgv[2] << " does not exist" << '\n'; return 1; } @@ -398,7 +398,7 @@ static Standard_Integer QABVH_PairSelect (Draw_Interpretor& theDI, aShape[1] = DBRep::Get (theArgv [3]); if (aShape[1].IsNull()) { - std::cout << theArgv[3] << " does not exist" << std::endl; + std::cout << theArgv[3] << " does not exist" << '\n'; return 1; } @@ -614,7 +614,7 @@ static Standard_Integer QABVH_PairDistance (Draw_Interpretor& theDI, aShape[0] = DBRep::Get (theArgv [1]); if (aShape[0].IsNull()) { - std::cout << theArgv[1] << " does not exist" << std::endl; + std::cout << theArgv[1] << " does not exist" << '\n'; return 1; } @@ -622,7 +622,7 @@ static Standard_Integer QABVH_PairDistance (Draw_Interpretor& theDI, aShape[1] = DBRep::Get (theArgv [2]); if (aShape[1].IsNull()) { - std::cout << theArgv[2] << " does not exist" << std::endl; + std::cout << theArgv[2] << " does not exist" << '\n'; return 1; } @@ -680,7 +680,7 @@ static Standard_Integer QABVH_PairDistance (Draw_Interpretor& theDI, aDistTool.SetBVHSets (aTriangleBoxSet[0].get(), aTriangleBoxSet[1].get()); Standard_Real aSqDist = aDistTool.ComputeDistance(); if (!aDistTool.IsDone()) - std::cout << "Not Done" << std::endl; + std::cout << "Not Done" << '\n'; else theDI << "Distance " << sqrt (aSqDist) << "\n"; @@ -784,7 +784,7 @@ static Standard_Integer QABVH_DistanceField (Draw_Interpretor& theDI, aShape = DBRep::Get (theArgv [1]); if (aShape.IsNull()) { - std::cout << theArgv[1] << " does not exist" << std::endl; + std::cout << theArgv[1] << " does not exist" << '\n'; return 1; } @@ -807,7 +807,7 @@ static Standard_Integer QABVH_DistanceField (Draw_Interpretor& theDI, for (Standard_Integer iZ = 0; iZ < aDField.DimensionZ(); ++iZ) { Standard_Real aDist = aDField.Voxel (iX, iY, iZ); - std::cout << "(" << iX << ", " << iY << ", " << iZ << "): " << aDist << std::endl; + std::cout << "(" << iX << ", " << iY << ", " << iZ << "): " << aDist << '\n'; } } } diff --git a/src/QADNaming/QADNaming.cxx b/src/QADNaming/QADNaming.cxx index 2b78847b6d..ae59f29576 100644 --- a/src/QADNaming/QADNaming.cxx +++ b/src/QADNaming/QADNaming.cxx @@ -79,7 +79,7 @@ TopoDS_Shape QADNaming::CurrentShape (const Standard_CString LabelName, TDF_Label Label; Standard_Boolean Found = DDF::AddLabel (DF, LabelName, Label); if (!Found) { - std::cout <<"no labels"< 4) { - std::cerr << "Usage: type help " << theArgs[0] << std::endl; + std::cerr << "Usage: type help " << theArgs[0] << '\n'; return 1; } diff --git a/src/QANCollection/QANCollection_Perf.cxx b/src/QANCollection/QANCollection_Perf.cxx index 4803ec82b1..d1d9064889 100644 --- a/src/QANCollection/QANCollection_Perf.cxx +++ b/src/QANCollection/QANCollection_Perf.cxx @@ -741,7 +741,7 @@ static void CompDoubleMap (Draw_Interpretor& theDI, printAllMeters(theDI); if (iFail1 || iFail2) std::cout << "Warning : N map failed " << iFail1 << " times, T map - " << - iFail2 << std::endl; + iFail2 << '\n'; } // ===================== Test perform of IndexedMap type ========================== diff --git a/src/QANCollection/QANCollection_Stl.cxx b/src/QANCollection/QANCollection_Stl.cxx index 1b16929711..b68ab595b0 100644 --- a/src/QANCollection/QANCollection_Stl.cxx +++ b/src/QANCollection/QANCollection_Stl.cxx @@ -464,10 +464,10 @@ void TestForwardIterator () it2 = it; // assignment it2 = it++; // postfix increment if (it2 == it || ! (it2 != it)) - std::cout << "Failed " << typeid(it).name() << " equality check" << std::endl; + std::cout << "Failed " << typeid(it).name() << " equality check" << '\n'; it2 = ++it; // prefix increment if (it2 != it || ! (it2 == it)) - std::cout << "Failed " << typeid(it).name() << " equality check" << std::endl; + std::cout << "Failed " << typeid(it).name() << " equality check" << '\n'; typename CollectionType::iterator::value_type t = *it; *it2 = t; @@ -479,10 +479,10 @@ void TestForwardIterator () cit2 = cit; // assignment cit2 = cit++; // postfix increment if (cit2 == cit || ! (cit2 != cit)) - std::cout << "Failed " << typeid(cit).name() << " equality check" << std::endl; + std::cout << "Failed " << typeid(cit).name() << " equality check" << '\n'; cit2 = ++cit; // prefix increment if (cit2 != it || ! (cit2 == cit)) - std::cout << "Failed " << typeid(cit).name() << " equality check" << std::endl; + std::cout << "Failed " << typeid(cit).name() << " equality check" << '\n'; typename CollectionType::const_iterator::value_type ct = *cit; ct = *cit; @@ -508,10 +508,10 @@ void TestBidirIterator () typename CollectionType::iterator it = aCollec->end(); // copy construction typename CollectionType::iterator it2 = it--; // postfix decrement if (it2 == it || ! (it2 != it)) - std::cout << "Failed " << typeid(it).name() << " equality check" << std::endl; + std::cout << "Failed " << typeid(it).name() << " equality check" << '\n'; it2 = --it; // prefix decrement if (it2 != it || ! (it2 == it)) - std::cout << "Failed " << typeid(it).name() << " equality check" << std::endl; + std::cout << "Failed " << typeid(it).name() << " equality check" << '\n'; delete aCollec; } @@ -531,20 +531,20 @@ void TestRandomIterator () typename CollectionType::iterator it = aCollec->begin(); // copy construction typename CollectionType::iterator it2 = it + 5; if ((it2 - it) != 5) - std::cout << "Failed " << typeid(it).name() << " arithmetics" << std::endl; + std::cout << "Failed " << typeid(it).name() << " arithmetics" << '\n'; if (it2 < it || it2 <= it || ! (it2 > it) || ! (it2 >= it)) - std::cout << "Failed " << typeid(it).name() << " comparison" << std::endl; + std::cout << "Failed " << typeid(it).name() << " comparison" << '\n'; it += 5; if (it2 != it) - std::cout << "Failed " << typeid(it).name() << " arithmetics" << std::endl; + std::cout << "Failed " << typeid(it).name() << " arithmetics" << '\n'; it2 = it - 5; if ((it2 - it) != -5) - std::cout << "Failed " << typeid(it).name() << " arithmetics" << std::endl; + std::cout << "Failed " << typeid(it).name() << " arithmetics" << '\n'; if (it2 > it || it2 >= it || ! (it2 < it) || ! (it2 <= it)) - std::cout << "Failed " << typeid(it).name() << " comparison" << std::endl; + std::cout << "Failed " << typeid(it).name() << " comparison" << '\n'; it -= 5; if (it2 != it) - std::cout << "Failed " << typeid(it).name() << " arithmetics" << std::endl; + std::cout << "Failed " << typeid(it).name() << " arithmetics" << '\n'; typename CollectionType::value_type t = it[5]; // offset dereference *it = t; @@ -564,35 +564,35 @@ static Standard_Integer QANListStlIterator (Draw_Interpretor&, Standard_Integer, // run-time tests Standard_Boolean aResult = TestIteration, std::list >(); std::cout << "NCollection_List Iteration: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestIteration, std::list >(); std::cout << "NCollection_List Iteration: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestMinMax, std::list >(); std::cout << "NCollection_List Min-Max: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestMinMax, std::list >(); std::cout << "NCollection_List Min-Max: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestReplace, std::list >(); std::cout << "NCollection_List Replace: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestReplace, std::list >(); std::cout << "NCollection_List Replace: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestParallel< NCollection_List, std::list >(); std::cout << "NCollection_List Parallel: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestParallel, std::list >(); std::cout << "NCollection_List Parallel: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; return 0; } @@ -609,11 +609,11 @@ static Standard_Integer QANMapStlIterator (Draw_Interpretor&, Standard_Integer, // run-time tests Standard_Boolean aResult = TestMapIteration, Standard_Integer>(); std::cout << "NCollection_Map Iteration: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestMapIteration, Standard_Real>(); std::cout << "NCollection_Map Iteration: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; return 0; } @@ -631,11 +631,11 @@ static Standard_Integer QANIndexedMapStlIterator (Draw_Interpretor&, Standard_In // run-time tests Standard_Boolean aResult = TestMapIteration, Standard_Integer>(); std::cout << "NCollection_IndexedMap Iteration: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestMapIteration, Standard_Real>(); std::cout << "NCollection_IndexedMap Iteration: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; return 0; } @@ -653,19 +653,19 @@ static Standard_Integer QANDataMapStlIterator (Draw_Interpretor&, Standard_Integ // run-time tests Standard_Boolean aResult = TestMapIteration, Standard_Integer>(); std::cout << "NCollection_DataMap Iteration: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestMapIteration, Standard_Real>(); std::cout << "NCollection_DataMap Iteration: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestDataMapParallel, Standard_Integer>(); std::cout << "NCollection_DataMap Parallel: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestDataMapParallel, Standard_Real>(); std::cout << "NCollection_DataMap Parallel: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; return 0; } @@ -683,19 +683,19 @@ static Standard_Integer QANIndexedDataMapStlIterator (Draw_Interpretor&, Standar // run-time tests Standard_Boolean aResult = TestMapIteration, Standard_Integer>(); std::cout << "NCollection_IndexedDataMap Iteration: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestMapIteration, Standard_Real>(); std::cout << "NCollection_IndexedDataMap Iteration: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestDataMapParallel, Standard_Integer>(); std::cout << "NCollection_IndexedDataMap Parallel: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestDataMapParallel, Standard_Real>(); std::cout << "NCollection_IndexedDataMap Parallel: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; return 0; } @@ -713,43 +713,43 @@ static Standard_Integer QANSequenceStlIterator (Draw_Interpretor&, Standard_Inte // run-time tests Standard_Boolean aResult = TestIteration, std::list >(); std::cout << "NCollection_Sequence Iteration: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestIteration, std::list >(); std::cout << "NCollection_Sequence Iteration: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestMinMax, std::list >(); std::cout << "NCollection_Sequence Min-Max: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestMinMax, std::list >(); std::cout << "NCollection_Sequence Min-Max: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestReplace, std::list >(); std::cout << "NCollection_Sequence Replace: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestReplace, std::list >(); std::cout << "NCollection_Sequence Replace: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestReverse, std::list >(); std::cout << "NCollection_Sequence Reverse: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestReverse, std::list >(); std::cout << "NCollection_Sequence Reverse: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestParallel, std::list >(); std::cout << "NCollection_Sequence Parallel: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestParallel, std::list >(); std::cout << "NCollection_Sequence Parallel: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; return 0; } @@ -768,51 +768,51 @@ static Standard_Integer QANVectorStlIterator (Draw_Interpretor&, Standard_Intege // run-time tests Standard_Boolean aResult = TestIteration, std::vector >(); std::cout << "NCollection_Vector Iteration: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestIteration, std::vector >(); std::cout << "NCollection_Vector Iteration: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestMinMax, std::vector >(); std::cout << "NCollection_Vector Min-Max: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestMinMax, std::vector >(); std::cout << "NCollection_Vector Min-Max: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestReplace, std::vector >(); std::cout << "NCollection_Vector Replace: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestReplace, std::vector >(); std::cout << "NCollection_Vector Replace: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestReverse, std::vector >(); std::cout << "NCollection_Vector Reverse: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestReverse, std::vector >(); std::cout << "NCollection_Vector Reverse: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestSort, std::vector >(); std::cout << "NCollection_Vector Sort: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestSort, std::vector >(); std::cout << "NCollection_Vector Sort: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestParallel, std::vector >(); std::cout << "NCollection_Vector Parallel: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestParallel, std::vector >(); std::cout << "NCollection_Vector Parallel: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; { // Test case for a corner case described in a bug #0027941 @@ -833,7 +833,7 @@ static Standard_Integer QANVectorStlIterator (Draw_Interpretor&, Standard_Intege NCollection_Vector::iterator aShift = aBegin + THE_INCREMENT; aResult = (aShift == anEnd); std::cout << "NCollection_Vector Offset: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; std::stable_sort (aVector.begin(), aVector.end()); } @@ -855,51 +855,51 @@ static Standard_Integer QANArray1StlIterator (Draw_Interpretor&, Standard_Intege // run-time tests Standard_Boolean aResult = TestIteration, std::vector >(); std::cout << "NCollection_Array1 Iteration: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestIteration, std::vector >(); std::cout << "NCollection_Array1 Iteration: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestMinMax, std::vector >(); std::cout << "NCollection_Array1 Min-Max: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestMinMax, std::vector >(); std::cout << "NCollection_Array1 Min-Max: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestReplace, std::vector >(); std::cout << "NCollection_Array1 Replace: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestReplace, std::vector >(); std::cout << "NCollection_Array1 Replace: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestReverse, std::vector >(); std::cout << "NCollection_Array1 Reverse: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestReverse, std::vector >(); std::cout << "NCollection_Array1 Reverse: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestSort, std::vector >(); std::cout << "NCollection_Array1 Sort: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestSort, std::vector >(); std::cout << "NCollection_Array1 Sort: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestParallel, std::vector >(); std::cout << "NCollection_Array1 Parallel: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; aResult = TestParallel, std::vector >(); std::cout << "NCollection_Array1 Parallel: " << - (aResult ? "SUCCESS" : "FAIL") << std::endl; + (aResult ? "SUCCESS" : "FAIL") << '\n'; return 0; } diff --git a/src/QANCollection/QANCollection_Test.cxx b/src/QANCollection/QANCollection_Test.cxx index 40cc1f261a..c8b6afca19 100644 --- a/src/QANCollection/QANCollection_Test.cxx +++ b/src/QANCollection/QANCollection_Test.cxx @@ -876,14 +876,14 @@ static Standard_Integer QANColTestVector (Draw_Interpretor&, Standard_Integer, c aVec.Append(5); if (aVec(0) != 5) - std::cout << "Error: wrong value in original vector!" << std::endl; + std::cout << "Error: wrong value in original vector!" << '\n'; aVec2.Append(5); if (aVec2(0) != 5) - std::cout << "Error: wrong value in copy-constructed vector!" << std::endl; + std::cout << "Error: wrong value in copy-constructed vector!" << '\n'; aVec3.Append(5); if (aVec3(0) != 5) - std::cout << "Error: wrong value in copied vector!" << std::endl; - std::cout << "Test OK" << std::endl; + std::cout << "Error: wrong value in copied vector!" << '\n'; + std::cout << "Test OK" << '\n'; return 0; } @@ -933,7 +933,7 @@ static bool CheckArrayByValue(NCollection_Array1 theArray) { if (theArray.Value(i) != i + 113.) { - std::cout << "Error at item " << i << ": value = " << theArray.Value(i) << ", expected " << i + 113. << std::endl; + std::cout << "Error at item " << i << ": value = " << theArray.Value(i) << ", expected " << i + 113. << '\n'; return false; } } diff --git a/src/Resource/Resource_Manager.cxx b/src/Resource/Resource_Manager.cxx index e773d624d6..86f0dfc723 100644 --- a/src/Resource/Resource_Manager.cxx +++ b/src/Resource/Resource_Manager.cxx @@ -79,7 +79,7 @@ Resource_Manager::Resource_Manager (const TCollection_AsciiString& theName, } else if (myVerbose) { - std::cout << "Resource Manager Warning: aDefaultsDirectory is empty." << std::endl; + std::cout << "Resource Manager Warning: aDefaultsDirectory is empty." << '\n'; } if (!theUserDefaultsDirectory.IsEmpty()) @@ -97,7 +97,7 @@ Resource_Manager::Resource_Manager (const TCollection_AsciiString& theName, } else if (myVerbose) { - std::cout << "Resource Manager Warning: anUserDefaultsDirectory is empty." << std::endl; + std::cout << "Resource Manager Warning: anUserDefaultsDirectory is empty." << '\n'; } } @@ -120,12 +120,12 @@ Resource_Manager::Resource_Manager(const Standard_CString aName, if (!aPath.IsEmpty()) Load(aPath,myRefMap); else if (myVerbose) - std::cout << "Resource Manager Warning: Environment variable \"CSF_" << aName << "Defaults\" not set." << std::endl; + std::cout << "Resource Manager Warning: Environment variable \"CSF_" << aName << "Defaults\" not set." << '\n'; if (!aUserPath.IsEmpty()) Load(aUserPath,myRefMap); else if (myVerbose) - std::cout << "Resource Manager Warning: Environment variable \"CSF_" << aName << "UserDefaults\" not set." << std::endl; + std::cout << "Resource Manager Warning: Environment variable \"CSF_" << aName << "UserDefaults\" not set." << '\n'; } // ======================================================================= @@ -154,7 +154,7 @@ void Resource_Manager::Load(const TCollection_AsciiString& thePath, if (File.Failed()) { if (myVerbose) std::cout << "Resource Manager Warning: Cannot read file \"" << FileName - << "\". File not found or permission denied." << std::endl; + << "\". File not found or permission denied." << '\n'; return; } Standard_Integer LineNumber = 1; @@ -171,7 +171,7 @@ void Resource_Manager::Load(const TCollection_AsciiString& thePath, case Resource_KOL_Error: if (myVerbose) std::cout << "Resource Manager: Syntax error at line " - << LineNumber << " in file : " << FileName << std::endl; + << LineNumber << " in file : " << FileName << '\n'; break; } LineNumber++; @@ -179,7 +179,7 @@ void Resource_Manager::Load(const TCollection_AsciiString& thePath, File.Close(); if (myVerbose) std::cout << "Resource Manager: " << ((&aMap == &myUserMap) ? "User" : "Reference") - << " file \"" << FileName << "\" loaded" << std::endl; + << " file \"" << FileName << "\" loaded" << '\n'; } static Resource_KindOfLine WhatKindOfLine(OSD_File& aFile, @@ -237,7 +237,7 @@ static Resource_KindOfLine WhatKindOfLine(OSD_File& aFile, aToken2 = Line; } if (Debug) - std::cout << "'\t Value = '" << aToken2 << "'" << std::endl << std::flush; + std::cout << "'\t Value = '" << aToken2 << "'" << '\n' << std::flush; return Resource_KOL_Resource; } @@ -279,7 +279,7 @@ Standard_Boolean Resource_Manager::Save() const if (dir.IsEmpty()) { if (myVerbose) std::cout << "Resource Manager Warning: environment variable \"" - << anEnvVar << "\" not set. Cannot save resources." << std::endl ; + << anEnvVar << "\" not set. Cannot save resources." << '\n' ; return Standard_False; } @@ -301,7 +301,7 @@ Standard_Boolean Resource_Manager::Save() const if (!aStatus) { if (myVerbose) std::cout << "Resource Manager: Error opening or creating directory \"" << aFilePath - << "\". Permission denied. Cannot save resources." << std::endl; + << "\". Permission denied. Cannot save resources." << '\n'; return Standard_False; } } @@ -330,7 +330,7 @@ Standard_Boolean Resource_Manager::Save() const if (!aStatus) { if (myVerbose) std::cout << "Resource Manager: Error opening or creating file \"" << aFilePath - << "\". Permission denied. Cannot save resources." << std::endl; + << "\". Permission denied. Cannot save resources." << '\n'; return Standard_False; } @@ -360,12 +360,12 @@ Standard_Boolean Resource_Manager::Save() const Line = KeyArray(Index) + ":\t" + Value + "\n"; if (Debug) - std::cout << "Line = '" << Line << "'" << std::endl; + std::cout << "Line = '" << Line << "'" << '\n'; File.Write(Line, Line.Length()); } if (myVerbose) - std::cout << "Resource Manager: Resources saved in file " << aFilePath << std::endl; + std::cout << "Resource Manager: Resources saved in file " << aFilePath << '\n'; } File.Close(); return Standard_True; diff --git a/src/STEPControl/STEPControl_ActorRead.cxx b/src/STEPControl/STEPControl_ActorRead.cxx index 413b6f4f19..2dac8d9b99 100644 --- a/src/STEPControl/STEPControl_ActorRead.cxx +++ b/src/STEPControl/STEPControl_ActorRead.cxx @@ -590,7 +590,7 @@ static void getSDR(const Handle(StepRepr_ProductDefinitionShape)& PDS, #ifdef TRANSLOG if (TP->TraceLevel() > 1) - sout<<" -- Actor : Ent.n0 "<Model()->Number(PD)<<" -> Shared Ent.no"<Model()->Number(NAUO)<Model()->Number(PD)<<" -> Shared Ent.no"<Model()->Number(NAUO)<<'\n'; #endif Handle(Transfer_Binder) binder; Message_ProgressRange aRange = PS.Next(); @@ -814,7 +814,7 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity( Message_Messenger::StreamBuffer sout = TP->Messenger()->SendInfo(); #ifdef TRANSLOG if (TP->TraceLevel() > 2) - sout<<" -- Actor : case ShapeRepr. NbItems="<ItemsValue(i); if(anitem.IsNull()) @@ -1363,7 +1363,7 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::OldWay #ifdef TRANSLOG if (TP->TraceLevel() > 2) - sout<<" -- Actor : case shape_definition_representation."<Find(rep); { @@ -1414,7 +1414,7 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::OldWay // if (anitem.IsNull()) continue; #ifdef TRANSLOG if (TP->TraceLevel() > 1) - sout<<" -- Actor : Ent.n0 "<Model()->Number(start)<<" -> Shared Ent.no"<Model()->Number(anitem)<Model()->Number(start)<<" -> Shared Ent.no"<Model()->Number(anitem)<<'\n'; #endif if (!TP->IsBound(anitem)) binder = TP->Transferring(anitem, aRange); @@ -1456,7 +1456,7 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity OSD_Timer chrono; if (TP->TraceLevel() > 2) sout << "Begin transfer STEP -> CASCADE, Type " - << start->DynamicType()->Name() << std::endl; + << start->DynamicType()->Name() << '\n'; chrono.Start(); #endif Handle(StepData_StepModel) aStepModel = Handle(StepData_StepModel)::DownCast(TP->Model()); @@ -1568,7 +1568,7 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity #ifdef TRANSLOG chrono.Stop(); if (TP->TraceLevel() > 2) - sout<<"End transfer STEP -> CASCADE :" << (found ? "OK" : " : no result")< CASCADE :" << (found ? "OK" : " : no result")<<'\n'; if (TP->TraceLevel() > 2) chrono.Show(); #endif @@ -1771,7 +1771,7 @@ Handle(Transfer_Binder) STEPControl_ActorRead::TransferShape( #ifdef TRANSLOG // POUR MISE AU POINT, a supprimer ensuite if (TP->TraceLevel() > 1) - sout<<" -- Actor : Transfer Ent.n0 "<Model()->Number(start)<<" Type "<DynamicType()->Name()<Model()->Number(start)<<" Type "<DynamicType()->Name()<<'\n'; #endif Handle(TransferBRep_ShapeBinder) shbinder; @@ -1928,7 +1928,7 @@ void STEPControl_ActorRead::PrepareUnits(const Handle(StepRepr_Representation)& // Assign uncertainty #ifdef TRANSLOG if (TP->TraceLevel() > 1) - TP->Messenger()->SendInfo() <<" Cc1ToTopoDS : Length Unit = "<StringLabel(cmp->GetSDR())->ToCString()<<"\t"; - os << "Product: "<GetSDR())<GetSDR())<<'\n'; for ( Standard_Integer i = 1; i <= cmp->GetList()->Length(); i++) { for ( Standard_Integer j=0; j < level+1; j++ ) os << "\t"; os << "NAUO :"<StringLabel(cmp->GetList()->Value(i)->GetNAUO())->ToCString()<<";\t"; @@ -183,7 +183,7 @@ void STEPSelections_AssemblyExplorer::Dump(Standard_OStream &os) const { Handle(Interface_InterfaceModel) model = myGraph.Model(); for(Standard_Integer i = 1 ; i <=myRoots.Length(); i++) { - os<<"Assembly N: "<GetMessageString() << std::endl; + std::cerr << "\t... The exception is:" << theError->GetMessageString() << '\n'; exit(1); } diff --git a/src/StdLDrivers/StdLDrivers_DocumentRetrievalDriver.cxx b/src/StdLDrivers/StdLDrivers_DocumentRetrievalDriver.cxx index 09b69deb7a..f7deb78c73 100644 --- a/src/StdLDrivers/StdLDrivers_DocumentRetrievalDriver.cxx +++ b/src/StdLDrivers/StdLDrivers_DocumentRetrievalDriver.cxx @@ -90,7 +90,7 @@ Handle(StdObjMgt_Persistent) StdLDrivers_DocumentRetrievalDriver::read ( myReaderStatus = PCDM_RS_OpenError; Standard_SStream aMsg; - aMsg << anException << std::endl; + aMsg << anException << '\n'; throw Standard_Failure(aMsg.str().c_str()); } @@ -113,7 +113,7 @@ Handle(StdObjMgt_Persistent) StdLDrivers_DocumentRetrievalDriver::read ( myReaderStatus = PCDM_RS_NoDocument; Standard_SStream aMsg; - aMsg << "could not find any document in this file" << std::endl; + aMsg << "could not find any document in this file" << '\n'; throw Standard_Failure(aMsg.str().c_str()); } @@ -159,7 +159,7 @@ Handle(StdObjMgt_Persistent) StdLDrivers_DocumentRetrievalDriver::read ( { aMsg << anUnknownTypes(i); if (i < anUnknownTypes.Length()) aMsg << ","; - else aMsg << std::endl; + else aMsg << '\n'; } throw Standard_Failure(aMsg.str().c_str()); @@ -252,37 +252,37 @@ void StdLDrivers_DocumentRetrievalDriver::raiseOnStorageError (Storage_Error the case Storage_VSNotOpen: case Storage_VSAlreadyOpen: myReaderStatus = PCDM_RS_OpenError; - aMsg << "Stream Open Error" << std::endl; + aMsg << "Stream Open Error" << '\n'; throw Standard_Failure(aMsg.str().c_str()); case Storage_VSModeError: myReaderStatus = PCDM_RS_WrongStreamMode; - aMsg << "Stream is opened with a wrong mode for operation" << std::endl; + aMsg << "Stream is opened with a wrong mode for operation" << '\n'; throw Standard_Failure(aMsg.str().c_str()); case Storage_VSSectionNotFound: myReaderStatus = PCDM_RS_FormatFailure; - aMsg << "Section is not found" << std::endl; + aMsg << "Section is not found" << '\n'; throw Standard_Failure(aMsg.str().c_str()); case Storage_VSFormatError: myReaderStatus = PCDM_RS_FormatFailure; - aMsg << "Wrong format error" << std::endl; + aMsg << "Wrong format error" << '\n'; throw Standard_Failure(aMsg.str().c_str()); case Storage_VSUnknownType: myReaderStatus = PCDM_RS_TypeFailure; - aMsg << "Try to read an unknown type" << std::endl; + aMsg << "Try to read an unknown type" << '\n'; throw Standard_Failure(aMsg.str().c_str()); case Storage_VSTypeMismatch: myReaderStatus = PCDM_RS_TypeFailure; - aMsg << "Try to read a wrong primitive type" << std::endl; + aMsg << "Try to read a wrong primitive type" << '\n'; throw Standard_Failure(aMsg.str().c_str()); default: myReaderStatus = PCDM_RS_DriverFailure; - aMsg << "Retrieval Driver Failure" << std::endl; + aMsg << "Retrieval Driver Failure" << '\n'; throw Standard_Failure(aMsg.str().c_str()); } } diff --git a/src/StepData/StepData_StepDumper.cxx b/src/StepData/StepData_StepDumper.cxx index a3533c8034..337f8f880f 100644 --- a/src/StepData/StepData_StepDumper.cxx +++ b/src/StepData/StepData_StepDumper.cxx @@ -62,18 +62,18 @@ Standard_Boolean StepData_StepDumper::Dump TColStd_SequenceOfAsciiString listypes; if (!module->ComplexType(CN,listypes)) S << "(Complex Type : ask level > 0) cdl = " - << ent->DynamicType()->Name() << " (...);" << std::endl; + << ent->DynamicType()->Name() << " (...);" << '\n'; else { Standard_Integer n = listypes.Length(); for (i = 1; i <= n; i ++) S << listypes.Value(i) << " (...)"; - S << std::endl; + S << '\n'; } } - else S << module->StepType(CN) << " (...);" << std::endl; + else S << module->StepType(CN) << " (...);" << '\n'; } else S << "(Unrecognized Type for protocol) cdl = " - << ent->DynamicType()->Name() << " (...);" << std::endl; - if (nlab > 0) S << "/* Ident in file for "<DynamicType()->Name() << " (...);" << '\n'; + if (nlab > 0) S << "/* Ident in file for "<= 0) continue; S <<" #"< 0) { S <<" (ident = num): "; for (i = 1; i <= nb; i ++) { if (ids.Value(i) == i) S <<" #"< 79) { nbl = nbc; S < 79) { nbl = nbc; S <<'\n'; } else { nbl += nbr0; for (; nbr0 > 0; nbr0 --) S << " "; } S <#"< 5) { nbl = nbr = 0; S< 0) S < 0) S <<'\n'; } - if (nbi > 0) S <<"In dump, iii:#jjj means : entity rank iii has step ident #jjj"< 0) S <<"In dump, iii:#jjj means : entity rank iii has step ident #jjj"<<'\n'; // S<<" -- Dumping data, entity "< 0) diff --git a/src/StepData/StepData_StepReaderData.cxx b/src/StepData/StepData_StepReaderData.cxx index 49145ed10f..369768c14b 100644 --- a/src/StepData/StepData_StepReaderData.cxx +++ b/src/StepData/StepData_StepReaderData.cxx @@ -404,7 +404,7 @@ void StepData_StepReaderData::SetRecord(const Standard_Integer num, sout << " *** Incorrect record " << num << " (on " << NbRecords() << " -> " << num * 100 / NbRecords() << " % in File) ***"; if (prev > 0) sout << " Ident #" << theidents(prev); - sout << "\n" << errm << std::endl; + sout << "\n" << errm << '\n'; thecheck->AddWarning(errm.ToCString(), "Complex Type incorrect : "); } break; @@ -1801,7 +1801,7 @@ void StepData_StepReaderData::SetEntityNumbers(const Standard_Boolean withmap) Standard_Integer numsub = FP.EntityNumber(); if (numsub > thelastn) { Message::SendInfo() - << "Bad Sub.N0, Record " << num << " Param " << na << ":$" << numsub << std::endl; + << "Bad Sub.N0, Record " << num << " Param " << na << ":$" << numsub << '\n'; continue; } FP.SetEntityNumber(subn(numsub)); @@ -1826,7 +1826,7 @@ void StepData_StepReaderData::SetEntityNumbers(const Standard_Boolean withmap) // ... Et sortir message un peu plus complet sout << "*** ERR StepReaderData *** Entite #" << ident << "\n Type:" << RecordType(num) - << " Param.n0 " << na << ": #" << id << " Not found" << std::endl; + << " Param.n0 " << na << ": #" << id << " Not found" << '\n'; } // FIN Mapping } // FIN Traitement Reference } // FIN Boucle Parametres @@ -1893,7 +1893,7 @@ void StepData_StepReaderData::SetEntityNumbers(const Standard_Boolean withmap) char ligne[80]; sprintf(ligne, "Ident defined SEVERAL TIMES : #%d", ident); thecheck->AddFail(ligne, "Ident defined SEVERAL TIMES : #%d"); - sout << "StepReaderData : SetEntityNumbers, " << ligne << std::endl; + sout << "StepReaderData : SetEntityNumbers, " << ligne << '\n'; } if (indm(indmap) > 0) indm(indmap) = -indm(indmap); // Pas pour Map // Cas Normal pour la Map @@ -2087,7 +2087,7 @@ void StepData_StepReaderData::SetEntityNumbers(const Standard_Boolean withmap) sout << "*** ERR StepReaderData *** Entite " << nument << ", a " << (nr * 100) / nbseq << "% de DATA : #" << ident << "\n Type:" << RecordType(num) - << " Param.n0 " << na << ": #" << id << " Not found" << std::endl; + << " Param.n0 " << na << ": #" << id << " Not found" << '\n'; FP.SetEntityNumber(0); // -> Reference non resolue } diff --git a/src/StepData/StepData_StepReaderTool.cxx b/src/StepData/StepData_StepReaderTool.cxx index 9ece1b80b8..b90dd2b8da 100644 --- a/src/StepData/StepData_StepReaderTool.cxx +++ b/src/StepData/StepData_StepReaderTool.cxx @@ -183,7 +183,7 @@ void StepData_StepReaderTool::BeginRead Handle(Interface_Check) mch = model->GlobalCheck(); Standard_Integer nbmess = ach->NbWarnings(); sout<DynamicType()->Name() << std::endl; + if (!ent.IsNull()) sout << ent->DynamicType()->Name() << '\n'; for (Standard_Integer nf = 1; nf <= nbmess; nf++) { sout << ach->CWarning(nf) << "\n"; @@ -193,7 +193,7 @@ void StepData_StepReaderTool::BeginRead Handle(Interface_Check) mch = model->GlobalCheck(); Standard_Integer nbmess = ach->NbFails(); sout << " Fails on Reading Header Entity N0." << i << ":"; - if (!ent.IsNull()) sout << ent->DynamicType()->Name() << std::endl; + if (!ent.IsNull()) sout << ent->DynamicType()->Name() << '\n'; for (Standard_Integer nf = 1; nf <= nbmess; nf++) { sout << ach->CFail(nf) << "\n"; diff --git a/src/StepFile/StepFile_Read.cxx b/src/StepFile/StepFile_Read.cxx index 26319a7c43..f0aa5e0a11 100644 --- a/src/StepFile/StepFile_Read.cxx +++ b/src/StepFile/StepFile_Read.cxx @@ -52,7 +52,7 @@ void StepFile_Interrupt(Standard_CString theErrorMessage, const Standard_Boolean return; Message_Messenger::StreamBuffer sout = theIsFail ? Message::SendFail() : Message::SendTrace(); - sout << "**** ERR StepFile : " << theErrorMessage << " ****" << std::endl; + sout << "**** ERR StepFile : " << theErrorMessage << " ****" << '\n'; } static Standard_Integer StepFile_Read (const char* theName, diff --git a/src/StepSelect/StepSelect_Activator.cxx b/src/StepSelect/StepSelect_Activator.cxx index e4d1a3cf74..bf6eb1a25e 100644 --- a/src/StepSelect/StepSelect_Activator.cxx +++ b/src/StepSelect/StepSelect_Activator.cxx @@ -60,41 +60,41 @@ IFSelect_ReturnStatus StepSelect_Activator::Do case 1 : { // **** StepSchema if (argc < 2) { - std::cout<<"Identify an entity"<Number(arg1); if (num <= 0) { - std::cout<<"Not an entity : "<Session()->StartingEntity(num); DeclareAndCast(StepData_UndefinedEntity,und,ent); if (!und.IsNull()) { - std::cout<<"Entity "<StepType()<StepType()<<'\n'; return IFSelect_RetVoid; } DeclareAndCast(StepData_Plex,plx,ent); if (!plx.IsNull()) { - std::cout<<"Entity "<DynamicType()->Name()<DynamicType()->Name()<<'\n'; return IFSelect_RetVoid; } case 40 : { // **** FloatFormat char prem = ' '; if (argc < 2) prem = '?'; - else if (argc == 5) { std::cout<<"floatformat tout court donne les formes admises"< 4) { Rmin = Atof(pilot->Word(4).ToCString()); Rmax = Atof(pilot->Word(5).ToCString()); - if (Rmin <= 0 || Rmax <= 0) { std::cout<<"intervalle : donner reels > 0"< 0"<<'\n'; return IFSelect_RetError; } } Handle(StepSelect_FloatFormat) fm = new StepSelect_FloatFormat; if (argc == 2) fm->SetDefault(digits); diff --git a/src/StepSelect/StepSelect_WorkLibrary.cxx b/src/StepSelect/StepSelect_WorkLibrary.cxx index 777ac6bf9a..78831a813d 100644 --- a/src/StepSelect/StepSelect_WorkLibrary.cxx +++ b/src/StepSelect/StepSelect_WorkLibrary.cxx @@ -90,7 +90,7 @@ Standard_Boolean StepSelect_WorkLibrary::WriteFile if (aStream.get() == NULL) { ctx.CCheck(0)->AddFail("Step File could not be created"); - sout<<" Step File could not be created : " << ctx.FileName() << std::endl; return 0; + sout<<" Step File could not be created : " << ctx.FileName() << '\n'; return 0; } sout << " Step File Name : "<GetMessages(chl.Value()); sout<<" Write "; Standard_Boolean isGood = SW.Print (*aStream); - sout<<" Done"<flush(); isGood = aStream->good() && isGood && !errno; aStream.reset(); if(errno) - sout << strerror(errno) << std::endl; + sout << strerror(errno) << '\n'; return isGood; } @@ -152,14 +152,14 @@ void StepSelect_WorkLibrary::DumpEntity Handle(Standard_Transient) ent, con; ent = entity; S <<" --- (STEP) Entity "; model->Print(entity, S); if (iserr) con = model->ReportEntity(nument)->Content(); - if (entity.IsNull()) { S <<" Null"<DynamicType()->Name() << std::endl; + S << " Type cdl : " << entity->DynamicType()->Name() << '\n'; if (iserr) - S <<" *** NOT WELL LOADED : CONTENT FROM FILE ***"<IsUnknownEntity(nument)) - S <<" *** UNKNOWN TYPE ***"<TraceLevel() > 2) { - sout << "Geometric Statistics : " << std::endl; - sout << " Surface Continuity : - C0 : " << aTool.C0Surf() << std::endl; - sout << " - C1 : " << aTool.C1Surf() << std::endl; - sout << " - C2 : " << aTool.C2Surf() << std::endl; - sout << " Curve Continuity : - C0 : " << aTool.C0Cur3() << std::endl; - sout << " - C1 : " << aTool.C1Cur3() << std::endl; - sout << " - C2 : " << aTool.C2Cur3() << std::endl; - sout << " PCurve Continuity : - C0 : " << aTool.C0Cur2() << std::endl; - sout << " - C1 : " << aTool.C1Cur2() << std::endl; - sout << " - C2 : " << aTool.C2Cur2() << std::endl; + sout << "Geometric Statistics : " << '\n'; + sout << " Surface Continuity : - C0 : " << aTool.C0Surf() << '\n'; + sout << " - C1 : " << aTool.C1Surf() << '\n'; + sout << " - C2 : " << aTool.C2Surf() << '\n'; + sout << " Curve Continuity : - C0 : " << aTool.C0Cur3() << '\n'; + sout << " - C1 : " << aTool.C1Cur3() << '\n'; + sout << " - C2 : " << aTool.C2Cur3() << '\n'; + sout << " PCurve Continuity : - C0 : " << aTool.C0Cur2() << '\n'; + sout << " - C1 : " << aTool.C1Cur2() << '\n'; + sout << " - C2 : " << aTool.C2Cur2() << '\n'; } ResetPreci (aStepModel, aSolid, MaxTol()); @@ -249,16 +249,16 @@ void StepToTopoDS_Builder::Init(const Handle(StepShape_BrepWithVoids)& theBRepWi // Get Statistics : if (theTP->TraceLevel() > 2) { - sout << "Geometric Statistics : " << std::endl; - sout << " Surface Continuity : - C0 : " << aTool.C0Surf() << std::endl; - sout << " - C1 : " << aTool.C1Surf() << std::endl; - sout << " - C2 : " << aTool.C2Surf() << std::endl; - sout << " Curve Continuity : - C0 : " << aTool.C0Cur3() << std::endl; - sout << " - C1 : " << aTool.C1Cur3() << std::endl; - sout << " - C2 : " << aTool.C2Cur3() << std::endl; - sout << " PCurve Continuity : - C0 : " << aTool.C0Cur2() << std::endl; - sout << " - C1 : " << aTool.C1Cur2() << std::endl; - sout << " - C2 : " << aTool.C2Cur2() << std::endl; + sout << "Geometric Statistics : " << '\n'; + sout << " Surface Continuity : - C0 : " << aTool.C0Surf() << '\n'; + sout << " - C1 : " << aTool.C1Surf() << '\n'; + sout << " - C2 : " << aTool.C2Surf() << '\n'; + sout << " Curve Continuity : - C0 : " << aTool.C0Cur3() << '\n'; + sout << " - C1 : " << aTool.C1Cur3() << '\n'; + sout << " - C2 : " << aTool.C2Cur3() << '\n'; + sout << " PCurve Continuity : - C0 : " << aTool.C0Cur2() << '\n'; + sout << " - C1 : " << aTool.C1Cur2() << '\n'; + sout << " - C2 : " << aTool.C2Cur2() << '\n'; } //:S4136 ShapeFix::SameParameter (S,Standard_False); @@ -452,16 +452,16 @@ void StepToTopoDS_Builder::Init if ( TP->TraceLevel() > 2 ) { - sout << "Geometric Statistics : " << std::endl; - sout << " Surface Continuity : - C0 : " << myTool.C0Surf() << std::endl; - sout << " - C1 : " << myTool.C1Surf() << std::endl; - sout << " - C2 : " << myTool.C2Surf() << std::endl; - sout << " Curve Continuity : - C0 : " << myTool.C0Cur3() << std::endl; - sout << " - C1 : " << myTool.C1Cur3() << std::endl; - sout << " - C2 : " << myTool.C2Cur3() << std::endl; - sout << " PCurve Continuity : - C0 : " << myTool.C0Cur2() << std::endl; - sout << " - C1 : " << myTool.C1Cur2() << std::endl; - sout << " - C2 : " << myTool.C2Cur2() << std::endl; + sout << "Geometric Statistics : " << '\n'; + sout << " Surface Continuity : - C0 : " << myTool.C0Surf() << '\n'; + sout << " - C1 : " << myTool.C1Surf() << '\n'; + sout << " - C2 : " << myTool.C2Surf() << '\n'; + sout << " Curve Continuity : - C0 : " << myTool.C0Cur3() << '\n'; + sout << " - C1 : " << myTool.C1Cur3() << '\n'; + sout << " - C2 : " << myTool.C2Cur3() << '\n'; + sout << " PCurve Continuity : - C0 : " << myTool.C0Cur2() << '\n'; + sout << " - C1 : " << myTool.C1Cur2() << '\n'; + sout << " - C2 : " << myTool.C2Cur2() << '\n'; } //:S4136 ShapeFix::SameParameter (S,Standard_False); @@ -705,7 +705,7 @@ void StepToTopoDS_Builder::Init catch (Standard_Failure const& anException) { Message_Messenger::StreamBuffer sout = TP->Messenger()->SendInfo(); sout << "StepToTopoDS, GeometricSet, elem " << i << " of " << nbElem << ": exception "; - sout << anException.GetMessageString() << std::endl; + sout << anException.GetMessageString() << '\n'; } if (!aGeomCrv.IsNull()) { BRepBuilderAPI_MakeEdge anEdge(aGeomCrv, aGeomCrv->FirstParameter(), aGeomCrv->LastParameter()); diff --git a/src/TCollection/TCollection_HExtendedString.cxx b/src/TCollection/TCollection_HExtendedString.cxx index 558e2418cd..b6f17ad566 100644 --- a/src/TCollection/TCollection_HExtendedString.cxx +++ b/src/TCollection/TCollection_HExtendedString.cxx @@ -280,7 +280,7 @@ const TCollection_ExtendedString& TCollection_HExtendedString::String() const //--------------------------------------------------------------------- void TCollection_HExtendedString::Print(Standard_OStream& S) const { - S << "begin class HExtendedString "<====="<====="<<'\n'; + anOS<<"Root Labels :"<<'\n'<<"============="<<'\n'; for (TDF_ListIteratorOfLabelList itr1(myRootLabels); itr1.More(); itr1.Next()) { itr1.Value().EntryDump(anOS); anOS<<" | "; } - anOS<Label().EntryDump(anOS); anOS<<" \t"; itr3.Key()->Dump(anOS); - anOS<Dump(OS); OS<Dump(OS); OS<<'\n'; } } diff --git a/src/TDF/TDF_IDFilter.cxx b/src/TDF/TDF_IDFilter.cxx index abe3fee551..b3d5d0db72 100644 --- a/src/TDF/TDF_IDFilter.cxx +++ b/src/TDF/TDF_IDFilter.cxx @@ -151,11 +151,11 @@ void TDF_IDFilter::Dump(Standard_OStream& anOS) const if (myIgnore) anOS<<"ignores"; else anOS<<"keeps "; anOS<<" all IDs"; TDF_MapIteratorOfIDMap itr(myIDMap); if (itr.More()) { - anOS<<" BUT:"< 1) anOS<<"s"; anOS<<"."< 1) anOS<<"s"; anOS<<"."<<'\n'; for (TDF_AttributeIterator itr(myLabelNode); itr.More(); itr.Next()) { // CLE // const Handle(TDF_Attribute)& att = itr.Value(); @@ -384,7 +384,7 @@ void TDF_Label::InternalDump } } else { - anOS<<" has no attribute"<"; itr.Value()->Dump(anOS); anOS<<"| "; - anOS<1) anOS<<"s"; - anOS<<" referenced by the label structure."<Label().IsNull()) { - anOS<<" (no label)"<Label(),entry); - anOS<<" (label: "<ExtendedDump(anOS,aFilter,map); anOS<ExtendedDump(anOS,aFilter,map); anOS<<'\n'; } } - anOS<1) anOS<<"s"; - anOS<<" dumped between "<<--i<Lower(); upper = myValue->Upper(); for(i = lower; i<=upper; i++) - anOS << "\t" <Value(i)<Value(i)<<'\n'; } anOS << " Delta is " << (myIsDelta ? "ON":"OFF"); Standard_Character sguid[Standard_GUID_SIZE_ALLOC]; myID.ToCString(sguid); anOS << sguid; - anOS << std::endl; + anOS << '\n'; return anOS; } diff --git a/src/TDataStd/TDataStd_ExtStringList.cxx b/src/TDataStd/TDataStd_ExtStringList.cxx index 2caab46df1..dce0e593c6 100644 --- a/src/TDataStd/TDataStd_ExtStringList.cxx +++ b/src/TDataStd/TDataStd_ExtStringList.cxx @@ -364,7 +364,7 @@ Standard_OStream& TDataStd_ExtStringList::Dump (Standard_OStream& anOS) const Standard_Character sguid[Standard_GUID_SIZE_ALLOC]; myID.ToCString(sguid); anOS << sguid; - anOS << std::endl; + anOS << '\n'; return anOS; } diff --git a/src/TDataStd/TDataStd_IntPackedMap.cxx b/src/TDataStd/TDataStd_IntPackedMap.cxx index ef1f71bd50..269f24f231 100644 --- a/src/TDataStd/TDataStd_IntPackedMap.cxx +++ b/src/TDataStd/TDataStd_IntPackedMap.cxx @@ -218,7 +218,7 @@ Standard_OStream& TDataStd_IntPackedMap::Dump(Standard_OStream& theOS) const Standard_OStream& anOS = TDF_Attribute::Dump( theOS ); anOS << "IntPackedMap size = " << Extent(); anOS << " Delta is " << (myIsDelta ? "ON":"OFF"); - anOS << std::endl; + anOS << '\n'; return anOS; } diff --git a/src/TDataStd/TDataStd_IntegerArray.cxx b/src/TDataStd/TDataStd_IntegerArray.cxx index d827b1e604..018db22bf0 100644 --- a/src/TDataStd/TDataStd_IntegerArray.cxx +++ b/src/TDataStd/TDataStd_IntegerArray.cxx @@ -317,7 +317,7 @@ Standard_OStream& TDataStd_IntegerArray::Dump (Standard_OStream& anOS) const Standard_Character sguid[Standard_GUID_SIZE_ALLOC]; myID.ToCString(sguid); anOS << sguid; - anOS << std::endl; + anOS << '\n'; // anOS <<"\nAttribute fields: "; // anOS << TDF_Attribute::Dump(anOS); diff --git a/src/TDataStd/TDataStd_IntegerList.cxx b/src/TDataStd/TDataStd_IntegerList.cxx index 6702826dda..f28d1e79ab 100644 --- a/src/TDataStd/TDataStd_IntegerList.cxx +++ b/src/TDataStd/TDataStd_IntegerList.cxx @@ -360,7 +360,7 @@ Standard_OStream& TDataStd_IntegerList::Dump (Standard_OStream& anOS) const Standard_Character sguid[Standard_GUID_SIZE_ALLOC]; myID.ToCString(sguid); anOS << sguid; - anOS << std::endl; + anOS << '\n'; return anOS; } diff --git a/src/TDataStd/TDataStd_Name.cxx b/src/TDataStd/TDataStd_Name.cxx index 4c6a96afb1..f3fd3766cd 100644 --- a/src/TDataStd/TDataStd_Name.cxx +++ b/src/TDataStd/TDataStd_Name.cxx @@ -126,6 +126,6 @@ Standard_OStream& TDataStd_Name::Dump (Standard_OStream& anOS) const anOS << " Name=|"< 0; i--) { @@ -215,16 +215,16 @@ void TDocStd_MultiTransactionManager::DumpTransaction(Standard_OStream& anOS) co anOS<<" Undo: "; delta->Dump(anOS); if (i == 1) { - anOS<<" < Last action"<Dump(anOS); - anOS<Label()); if (Geom) return aNamedShape; if(aNamedShape.IsNull()) { - std::cout <<" %%% WARNING: TNaming_Naming::Name: FAILED"<> Idex = "<< i << " Type = "<<(myMap.FindKey(i))->DynamicType()<< std::endl; + std::cout <<"TNaming_Translator::DumpMap: Unexpected Type >> Idex = "<< i << " Type = "<<(myMap.FindKey(i))->DynamicType()<< '\n'; continue; } } diff --git a/src/TNaming/TNaming_UsedShapes.cxx b/src/TNaming/TNaming_UsedShapes.cxx index c52a581bfc..4e4ec9e39c 100644 --- a/src/TNaming/TNaming_UsedShapes.cxx +++ b/src/TNaming/TNaming_UsedShapes.cxx @@ -155,14 +155,14 @@ void TNaming_UsedShapes::Paste(const Handle(TDF_Attribute)&, Standard_OStream& TNaming_UsedShapes::Dump(Standard_OStream& anOS) const { - anOS<<"The content of UsedShapes attribute:"<Label().EntryDump(anOS); anOS << " Key_TShape = " <This(); anOS << " Value_TShape = " <Shape().TShape()->This(); - anOS<ShallowDump(S); items.Next(); } diff --git a/src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx b/src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx index 5d82c1632b..f8482d0e3a 100644 --- a/src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx +++ b/src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx @@ -338,7 +338,7 @@ static Standard_Boolean FUN_findTOOF(const TopOpeBRepDS_PDataStructure pDS, Standard_EXPORT Standard_Boolean GLOBAL_btcx = Standard_False; Standard_EXPORT void debtcxmess(Standard_Integer f1,Standard_Integer f2,Standard_Integer il) -{std::cout<<"f1,f2,il : "< aMaxNumberOfIterations) { - std::cout << "disjPerformFuse: programming error" << std::endl; + std::cout << "disjPerformFuse: programming error" << '\n'; return Standard_False; } theMapOfResult.Add(acurrentsolid); @@ -2115,7 +2115,7 @@ static Standard_Boolean disjPerformCommon(const TopTools_IndexedMapOfShape& theM LocalKPisdisjanalyse(stsol1, stsol2, TopOpeBRepBuild_KPart_Operation_Common, ires, icla1, icla2); if (ires == RESUNDEF || icla1 == SHEUNDEF || icla2 == SHEUNDEF) { - std::cout << "Warning: disjPerformCommon: can not determine solid's states" << std::endl; + std::cout << "Warning: disjPerformCommon: can not determine solid's states" << '\n'; continue; } switch (ires) { @@ -2192,7 +2192,7 @@ static Standard_Boolean disjPerformCut(const TopTools_IndexedMapOfShape& theMapO LocalKPisdisjanalyse(stsol1, stsol2, TopOpeBRepBuild_KPart_Operation_Cut12, ires, icla1, icla2); if (ires == RESUNDEF || icla1 == SHEUNDEF || icla2 == SHEUNDEF) { - std::cout << "Warning: disjPerformCut: can not determine solid's states" << std::endl; + std::cout << "Warning: disjPerformCut: can not determine solid's states" << '\n'; continue; } switch (ires) { diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_Check.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_Check.cxx index 1f48dcfef7..4d84ba6279 100644 --- a/src/TopOpeBRepDS/TopOpeBRepDS_Check.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_Check.cxx @@ -416,8 +416,8 @@ Standard_Boolean CheckEdgeParameter(const Handle(TopOpeBRepDS_HDataStructure)& m //======================================================================= Standard_OStream& TopOpeBRepDS_Check::PrintIntg(Standard_OStream& OS) { - OS<> buffer; if (strcmp(buffer,"Locations")) { - std::cout << "Not a location table "<> buffer; if (strcmp(buffer,"TShapes")) { - std::cout << "Not a TShape table"< 2) aSender << " [from: " << amsg.Original() << "]"; - aSender << std::endl; + aSender << '\n'; } } @@ -422,7 +422,7 @@ void Transfer_ProcessForFinder::AddFail(const Handle(Transfer_Finder)& start, Message_Messenger::StreamBuffer aSender = themessenger->SendFail(); aSender << " --> Fail : " << mess; if (orig[0] != '\0' && thetrace > 2) aSender << " [from: " << orig << "]"; - aSender << std::endl; + aSender << '\n'; } } @@ -470,7 +470,7 @@ void Transfer_ProcessForFinder::AddWarning(const Handle(Transfer_Finder)& start, Message_Messenger::StreamBuffer aSender = themessenger->SendWarning(); aSender << " --> Warning : " << mess; if (orig[0] != '\0' && thetrace > 2) aSender << " [from: " << orig << "]"; - aSender << std::endl; + aSender << '\n'; } } @@ -775,7 +775,7 @@ Handle(Transfer_Binder) Transfer_ProcessForFinder::Transferring(const Handle(Tra case Transfer_StatusInitial: break; case Transfer_StatusDone: - aSender << " .. and Transfer done" << std::endl; + aSender << " .. and Transfer done" << '\n'; return former; case Transfer_StatusRun: former->SetStatusExec(Transfer_StatusLoop); @@ -783,7 +783,7 @@ Handle(Transfer_Binder) Transfer_ProcessForFinder::Transferring(const Handle(Tra case Transfer_StatusError: if (thetrace) { - aSender << " *** Transfer in Error Status :" << std::endl; + aSender << " *** Transfer in Error Status :" << '\n'; StartTrace(former, start, thelevel, 0); } else StartTrace(former, start, thelevel, 4); @@ -791,7 +791,7 @@ Handle(Transfer_Binder) Transfer_ProcessForFinder::Transferring(const Handle(Tra case Transfer_StatusLoop: if (thetrace) { - aSender << " *** Transfer Head of Dead Loop :" << std::endl; + aSender << " *** Transfer Head of Dead Loop :" << '\n'; StartTrace(former, start, thelevel, 0); } else StartTrace(former, start, thelevel, 4); @@ -822,7 +822,7 @@ Handle(Transfer_Binder) Transfer_ProcessForFinder::Transferring(const Handle(Tra { if (binder.IsNull()) { - aSender << " *** Dead Loop with no Result" << std::endl; + aSender << " *** Dead Loop with no Result" << '\n'; if (thetrace) StartTrace(binder, start, thelevel - 1, 0); binder = new Transfer_VoidBinder; Bind(start, binder); newbind = Standard_True; @@ -831,7 +831,7 @@ Handle(Transfer_Binder) Transfer_ProcessForFinder::Transferring(const Handle(Tra { if (thetrace) { - aSender << " *** Dead Loop : Finding head of Loop :" << std::endl; + aSender << " *** Dead Loop : Finding head of Loop :" << '\n'; StartTrace(binder, start, thelevel - 1, 0); } else StartTrace(binder, start, thelevel - 1, 4); @@ -842,7 +842,7 @@ Handle(Transfer_Binder) Transfer_ProcessForFinder::Transferring(const Handle(Tra { if (thetrace) { - aSender << " *** Dead Loop : Actor in Loop :" << std::endl; + aSender << " *** Dead Loop : Actor in Loop :" << '\n'; StartTrace(binder, start, thelevel - 1, 0); } } @@ -853,14 +853,14 @@ Handle(Transfer_Binder) Transfer_ProcessForFinder::Transferring(const Handle(Tra { if (binder.IsNull()) { - aSender << " *** Exception Raised with no Result" << std::endl; + aSender << " *** Exception Raised with no Result" << '\n'; binder = new Transfer_VoidBinder; Bind(start, binder); newbind = Standard_True; } binder->AddFail("Transfer stopped by exception raising"); if (thetrace) { - aSender << " *** Raised : " << anException.GetMessageString() << std::endl; + aSender << " *** Raised : " << anException.GetMessageString() << '\n'; StartTrace(binder, start, thelevel - 1, 4); } thelevel = oldlev; @@ -1023,7 +1023,7 @@ void Transfer_ProcessForFinder::StartTrace(const Handle(Transfer_Binder)& binder aSender << "\n --- No Result recorded"; } } - aSender << std::endl; + aSender << '\n'; } //======================================================================= diff --git a/src/Transfer/Transfer_ProcessForTransient_0.cxx b/src/Transfer/Transfer_ProcessForTransient_0.cxx index 4611b27642..450e568234 100644 --- a/src/Transfer/Transfer_ProcessForTransient_0.cxx +++ b/src/Transfer/Transfer_ProcessForTransient_0.cxx @@ -403,7 +403,7 @@ void Transfer_ProcessForTransient::SendMsg(const Handle(Standard_Transient)& st aSender << amsg.Value(); if (amsg.IsEdited() && thetrace > 2) aSender << " [from: " << amsg.Original() << "]"; - aSender << std::endl; + aSender << '\n'; } } @@ -428,7 +428,7 @@ void Transfer_ProcessForTransient::AddFail(const Handle(Standard_Transient)& sta Message_Messenger::StreamBuffer aSender = themessenger->SendFail(); aSender << " --> Fail : " << mess; if (orig[0] != '\0' && thetrace > 2) aSender << " [from: " << orig << "]"; - aSender << std::endl; + aSender << '\n'; } } @@ -476,7 +476,7 @@ void Transfer_ProcessForTransient::AddWarning(const Handle(Standard_Transient)& Message_Messenger::StreamBuffer aSender = themessenger->SendWarning(); aSender << " --> Warning : " << mess; if (orig[0] != '\0' && thetrace > 2) aSender << " [from: " << orig << "]"; - aSender << std::endl; + aSender << '\n'; } } @@ -781,7 +781,7 @@ Handle(Transfer_Binder) Transfer_ProcessForTransient::Transferring(const Handle( case Transfer_StatusInitial: break; case Transfer_StatusDone: - aSender << " .. and Transfer done" << std::endl; + aSender << " .. and Transfer done" << '\n'; return former; case Transfer_StatusRun: former->SetStatusExec(Transfer_StatusLoop); @@ -789,7 +789,7 @@ Handle(Transfer_Binder) Transfer_ProcessForTransient::Transferring(const Handle( case Transfer_StatusError: if (thetrace) { - aSender << " *** Transfer in Error Status :" << std::endl; + aSender << " *** Transfer in Error Status :" << '\n'; StartTrace(former, start, thelevel, 0); } else StartTrace(former, start, thelevel, 4); @@ -797,7 +797,7 @@ Handle(Transfer_Binder) Transfer_ProcessForTransient::Transferring(const Handle( case Transfer_StatusLoop: if (thetrace) { - aSender << " *** Transfer Head of Dead Loop :" << std::endl; + aSender << " *** Transfer Head of Dead Loop :" << '\n'; StartTrace(former, start, thelevel, 0); } else StartTrace(former, start, thelevel, 4); @@ -825,7 +825,7 @@ Handle(Transfer_Binder) Transfer_ProcessForTransient::Transferring(const Handle( { if (binder.IsNull()) { - aSender << " *** Dead Loop with no Result" << std::endl; + aSender << " *** Dead Loop with no Result" << '\n'; if (thetrace) StartTrace(binder, start, thelevel - 1, 0); binder = new Transfer_VoidBinder; Bind(start, binder); newbind = Standard_True; @@ -834,7 +834,7 @@ Handle(Transfer_Binder) Transfer_ProcessForTransient::Transferring(const Handle( { if (thetrace) { - aSender << " *** Dead Loop : Finding head of Loop :" << std::endl; + aSender << " *** Dead Loop : Finding head of Loop :" << '\n'; StartTrace(binder, start, thelevel - 1, 0); } else StartTrace(binder, start, thelevel - 1, 4); @@ -845,7 +845,7 @@ Handle(Transfer_Binder) Transfer_ProcessForTransient::Transferring(const Handle( { if (thetrace) { - aSender << " *** Dead Loop : Actor in Loop :" << std::endl; + aSender << " *** Dead Loop : Actor in Loop :" << '\n'; StartTrace(binder, start, thelevel - 1, 0); } } @@ -856,14 +856,14 @@ Handle(Transfer_Binder) Transfer_ProcessForTransient::Transferring(const Handle( { if (binder.IsNull()) { - aSender << " *** Exception Raised with no Result" << std::endl; + aSender << " *** Exception Raised with no Result" << '\n'; binder = new Transfer_VoidBinder; Bind(start, binder); newbind = Standard_True; } binder->AddFail("Transfer stopped by exception raising"); if (thetrace) { - aSender << " *** Raised : " << anException.GetMessageString() << std::endl; + aSender << " *** Raised : " << anException.GetMessageString() << '\n'; StartTrace(binder, start, thelevel - 1, 4); } thelevel = oldlev; @@ -1020,7 +1020,7 @@ void Transfer_ProcessForTransient::StartTrace(const Handle(Transfer_Binder)& bin aSender << "\n --- No Result recorded"; } } - aSender << std::endl; + aSender << '\n'; } //======================================================================= diff --git a/src/Transfer/Transfer_TransientProcess.cxx b/src/Transfer/Transfer_TransientProcess.cxx index 1950dd4d74..6ce273bac7 100644 --- a/src/Transfer/Transfer_TransientProcess.cxx +++ b/src/Transfer/Transfer_TransientProcess.cxx @@ -235,16 +235,16 @@ void Transfer_TransientProcess::PrintStats(const Standard_Integer /*mode*/, { S<<"\n*******************************************************************\n"; // if (mode == 1) { // Statistiques de base - S<< "******** Basic Statistics ********"<NbEntities()<NbEntities()<<'\n'; Standard_Integer nbr = 0, nbe = 0, nbw = 0; Standard_Integer i, max = NbMapped(), nbroots = NbRoots(); - S<< "**** Nb Final Results : "<Messenger()->SendInfo(); sout<<"-- Transfer(Read) : "; theModel->Print (ent, sout); - sout<SetRoot(ent); @@ -172,7 +172,7 @@ TransferBRep_Reader::TransferBRep_Reader () Message_Messenger::StreamBuffer sout = theProc->Messenger()->SendInfo(); if (theProc->TraceLevel() > 1) - sout<<"-- Transfer(Read-List) : "<Print (ent, sout); - sout<SetRoot(ent); diff --git a/src/Units/Units_Dimensions.cxx b/src/Units/Units_Dimensions.cxx index 11e9849165..9edf5005b8 100644 --- a/src/Units/Units_Dimensions.cxx +++ b/src/Units/Units_Dimensions.cxx @@ -183,25 +183,25 @@ void Units_Dimensions::Dump(const Standard_Integer ashift) const { int i; for(i=0; i result is not correct"< result is not correct"<<'\n'; return; } Handle(Units_Token) newtoken=newunit.Evaluate(); @@ -274,7 +274,7 @@ Standard_Boolean Units_Measurement::HasToken() const void Units_Measurement::Dump() const { - std::cout<<" Measurement : "<Dump(1,1); } diff --git a/src/Units/Units_Quantity.cxx b/src/Units/Units_Quantity.cxx index 8250f2ba2c..3cd4a7a3f3 100644 --- a/src/Units/Units_Quantity.cxx +++ b/src/Units/Units_Quantity.cxx @@ -39,9 +39,9 @@ void Units_Quantity::Dump(const Standard_Integer ashift, const Standard_Integer alevel) const { Standard_Integer index; - std::cout<Dump(ashift+1); if(alevel > 0) { diff --git a/src/Units/Units_ShiftedToken.cxx b/src/Units/Units_ShiftedToken.cxx index 0a2e150c9e..c7b392585b 100644 --- a/src/Units/Units_ShiftedToken.cxx +++ b/src/Units/Units_ShiftedToken.cxx @@ -88,5 +88,5 @@ void Units_ShiftedToken::Dump(const Standard_Integer ashift, { Units_Token::Dump(ashift,alevel); for(int i=0; iDump(ashift); } diff --git a/src/Units/Units_Unit.cxx b/src/Units/Units_Unit.cxx index b36352edfd..c1fb85967e 100644 --- a/src/Units/Units_Unit.cxx +++ b/src/Units/Units_Unit.cxx @@ -127,7 +127,7 @@ void Units_Unit::Dump(const Standard_Integer /*ashift*/, if(index != 1) std::cout << " or " ; std::cout<<"\""< return 0"< return 0"<<'\n'; return 0.; } return ConvertSIValueToUserSystem(aquantity,avalue*(unitsentence.Evaluate())->Value()); @@ -403,11 +403,11 @@ void Units_UnitsSystem::Dump() const Handle(Standard_Transient) transient = This(); Handle(Units_UnitsSystem) unitssystem = Handle(Units_UnitsSystem)::DownCast (transient); Units_Explorer explorer(unitssystem); - std::cout<<" UNITSSYSTEM : "<::const_iterator anIt = myOptionStorage.begin(); for (++anIt; anIt != myOptionStorage.end(); ++anIt) { @@ -135,7 +135,7 @@ void ViewerTest_CmdParser::PrintHelp() const } std::cout << " : " << aCommandOption.Description; } - std::cout << std::endl; + std::cout << '\n'; } //=============================================================================================== diff --git a/src/ViewerTest/ViewerTest_ObjectCommands.cxx b/src/ViewerTest/ViewerTest_ObjectCommands.cxx index a28963a606..6b88aa437f 100644 --- a/src/ViewerTest/ViewerTest_ObjectCommands.cxx +++ b/src/ViewerTest/ViewerTest_ObjectCommands.cxx @@ -4675,7 +4675,7 @@ static Standard_Integer VListConnected (Draw_Interpretor& /*di*/, { std::cout << " connected to " << aMap.Find1 (aConnected->ConnectedTo()); } - std::cout << std::endl; + std::cout << '\n'; ++aCounter; } @@ -5481,23 +5481,23 @@ static Standard_Integer VPolygonOffset(Draw_Interpretor& /*di*/, if (anInterObj->HasPolygonOffsets()) { anInterObj->PolygonOffsets(aMode, aFactor, aUnits); - std::cout << "Current polygon offset parameters for " << argv[1] << ":" << std::endl; - std::cout << "\tMode: " << aMode << std::endl; - std::cout << "\tFactor: " << aFactor << std::endl; - std::cout << "\tUnits: " << aUnits << std::endl; + std::cout << "Current polygon offset parameters for " << argv[1] << ":" << '\n'; + std::cout << "\tMode: " << aMode << '\n'; + std::cout << "\tFactor: " << aFactor << '\n'; + std::cout << "\tUnits: " << aUnits << '\n'; return 0; } else { - std::cout << "Specific polygon offset parameters are not set for " << argv[1] << std::endl; + std::cout << "Specific polygon offset parameters are not set for " << argv[1] << '\n'; } } - std::cout << "Default polygon offset parameters:" << std::endl; + std::cout << "Default polygon offset parameters:" << '\n'; aContext->DefaultDrawer()->ShadingAspect()->Aspect()->PolygonOffsets(aMode, aFactor, aUnits); - std::cout << "\tMode: " << aMode << std::endl; - std::cout << "\tFactor: " << aFactor << std::endl; - std::cout << "\tUnits: " << aUnits << std::endl; + std::cout << "\tMode: " << aMode << '\n'; + std::cout << "\tFactor: " << aFactor << '\n'; + std::cout << "\tUnits: " << aUnits << '\n'; return 0; } diff --git a/src/ViewerTest/ViewerTest_ViewerCommands.cxx b/src/ViewerTest/ViewerTest_ViewerCommands.cxx index d700adce80..7a68808c22 100644 --- a/src/ViewerTest/ViewerTest_ViewerCommands.cxx +++ b/src/ViewerTest/ViewerTest_ViewerCommands.cxx @@ -5868,7 +5868,7 @@ static int VReadPixel (Draw_Interpretor& theDI, Standard_CString aWarnLog = theDI.Result(); if (aWarnLog != NULL && aWarnLog[0] != '\0') { - std::cout << aWarnLog << std::endl; + std::cout << aWarnLog << '\n'; } theDI.Reset(); @@ -13829,7 +13829,7 @@ static int VColorDiff (Draw_Interpretor& theDI, Standard_Integer theNbArgs, con { if (theNbArgs != 7) { - std::cerr << "Error: command syntax is incorrect, see help" << std::endl; + std::cerr << "Error: command syntax is incorrect, see help" << '\n'; return 1; } diff --git a/src/VrmlConverter/VrmlConverter_WFDeflectionRestrictedFace.cxx b/src/VrmlConverter/VrmlConverter_WFDeflectionRestrictedFace.cxx index bfba8b13be..c9e1a8333f 100644 --- a/src/VrmlConverter/VrmlConverter_WFDeflectionRestrictedFace.cxx +++ b/src/VrmlConverter/VrmlConverter_WFDeflectionRestrictedFace.cxx @@ -162,7 +162,7 @@ void VrmlConverter_WFDeflectionRestrictedFace::Add } } else { - std::cout << "Cannot evaluate curve on surface"<Label().IsNull() ) myFathers(i)->Label().EntryDump(anOS); - anOS<Label().IsNull() ) myChildren(i)->Label().EntryDump(anOS); - anOS<0) theDumpLog<0) theDumpLog<<'\n'; Standard_Integer i; for (i=1; i<=SeqLabels.Length(); i++) { DumpAssembly(theDumpLog, SeqLabels.Value(i), level, deep); @@ -1370,10 +1370,10 @@ Standard_OStream& XCAFDoc_ShapeTool::Dump(Standard_OStream& theDumpLog, const St SeqLabels.Clear(); GetFreeShapes(SeqLabels); - theDumpLog<NbOccurrences(theNode) << std::endl; + << theGraph->NbOccurrences(theNode) << '\n'; return Standard_True; } @@ -1679,7 +1679,7 @@ static Standard_Integer testDoc (Draw_Interpretor&, { if( argc < 2 ) { - std::cout<<"Invalid numbers of arguments should be: XTestDoc shape"<Pln(); diff --git a/src/XSControl/XSControl_FuncShape.cxx b/src/XSControl/XSControl_FuncShape.cxx index f2e84fb20c..4254d19c16 100644 --- a/src/XSControl/XSControl_FuncShape.cxx +++ b/src/XSControl/XSControl_FuncShape.cxx @@ -62,13 +62,13 @@ static IFSelect_ReturnStatus XSControl_tpdraw const Standard_CString arg3 = pilot->Arg(3); const Handle(Transfer_TransientProcess) &TP = XSControl::Session(pilot)->TransferReader()->TransientProcess(); Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (TP.IsNull()) { sout<<"No Transfer Read"<Model(); if (model.IsNull()) { if (mode == 0) { - sout<<"Pas de modele, preciser n0 d item de transfert"<NbRoots(); } if (tout) { n1 = 1; n2 = max; - sout<<", listage de 1 a "< max) { - sout<<" - Num="< 0) binder = TP->MapItem (index); if (binder.IsNull()) index = 0; if (index == 0) { - if (!tout) sout<<"Entite n0 "<HasResult()) { - if (!tout) sout<<"Entite n0 "<Result(); nbvar ++; - if (sh.IsNull()) { sout<<" (no Shape recorded)"< 2 && mode == 0) sprintf (nomvar,"%s_%d",arg2,nbvar); else sprintf (nomvar,"tp_%d",i); } - sout<<" -> 1 DRAW Shape: "< 1 DRAW Shape: "<SetShape(nomvar,sh); continue; } @@ -173,26 +173,26 @@ static IFSelect_ReturnStatus XSControl_tpdraw sout<<" -> "<Shape(j); if (nbvar < 0) nbvar = 0; nbvar ++; - if (sh.IsNull()) { sout<<" (no Shape recorded)"< 3 && mode > 0) sprintf (nomvar,"%s_%d",arg3,nbvar); else if (argc > 2 && mode == 0) sprintf (nomvar,"%s_%d",arg2,nbvar); else sprintf (nomvar,"tp_%d_%d",i,nbvar); sout<<" "<SetShape(nomvar,sh); } - sout<Result(); if (resu.IsNull()) { - sout<<"Entite n0 "<DynamicType()->Name(); - if (geom.IsNull()) { sout< 3 && mode > 0) sprintf (nomvar,"%s",arg3); @@ -205,15 +205,15 @@ static IFSelect_ReturnStatus XSControl_tpdraw } char* nomv = nomvar; XSControl::Vars(pilot)->Set (nomv,geom); - sout<<" -> DRAW Geom : "< DRAW Geom : "<ResultTypeName()<ResultTypeName()<<'\n'; } - if (sh.IsNull()) sout<<" (No Shape)"<Arg(1); const Handle(Transfer_TransientProcess) &TP = XSControl::Session(pilot)->TransferReader()->TransientProcess(); Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (TP.IsNull()) { sout<<"No Transfer Read"<Session(),pilot->CommandPart(2)); - if (lise.IsNull()) { sout<<"Not a valid entity list : "<CommandPart(2)<CommandPart(2)<<'\n'; return IFSelect_RetError; } list = TransferBRep::Shapes (TP,lise); sout<Length()<<" Entities, "; } - if (list.IsNull()) { sout<<"No Shape listed"<Length(); - sout<TransferReader(); Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (TR.IsNull()) { sout<<" manque init"<Model(); - if (mdl.IsNull()) { sout<<" modele absent"< 1 ? IFSelect_Functions::GiveEntityNumber(XSControl::Session(pilot),arg1) : 0); if (argc > 1) nomsh = arg1; else nomsh = cascomp ? "TREAD_COMP" : "TREAD_LIST"; - if (cassave) sout<<" save shapes -> current directory"< current directory"<<'\n'; if (num == 0 || cascomp) { TopoDS_Compound C; // pour cas compound @@ -286,11 +286,11 @@ static IFSelect_ReturnStatus XSControl_traccess B.MakeCompound(C); const Handle(TopTools_HSequenceOfShape) &list = TR->ShapeResultList(Standard_True); - sout<<" TOUS RESULTATS par ShapeResultList, soit "<Length()<Length()<<'\n'; for (Standard_Integer i = 1, nb = list->Length(); i <= nb; ++i) { noms = nomsh + "_" + i; - if ( (i%1000) == 0) sout<<"("<Value(i), noms.ToCString()); else if (cascomp) B.Add (C,list->Value(i)); } - sout<SetShape (nomsh.ToCString(), C); else if (cascomp && cassave) BRepTools::Write (C, nomsh.ToCString()); } else { - if (num < 1 || num > mdl->NbEntities()) { sout<<" incorrect:"< mdl->NbEntities()) { sout<<" incorrect:"<ShapeResult(mdl->Value(num)); - if (sh.IsNull()) { sout<<" Pas de resultat pour "< 2) nomsh = arg2; else nomsh = TCollection_AsciiString ("TREAD_") + num; if (!cascomp && !cassave) XSControl::Vars(pilot)->SetShape (nomsh.ToCString(), sh); else if (!cascomp && cassave) BRepTools::Write (sh, nomsh.ToCString()); - else sout<<"Option non comprise"<GetShape(a1); if (Shape.IsNull()) { - sout<<"Not a DRAW Shape:"<Model()->Print (ent, sout); - if ( silent ) sout << " in file " << XSControl::Session(pilot)->LoadedFile() << std::endl; + if ( silent ) sout << " in file " << XSControl::Session(pilot)->LoadedFile() << '\n'; } - if ( ! silent ) sout<Model()->Print (ent, sout); if ( silent ) sout << " in file " << XSControl::Session(pilot)->LoadedFile(); - sout< 0) { if ( silent ) sout << " in file " << XSControl::Session(pilot)->LoadedFile(); - sout<TransientProcess(); Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (TP.IsNull()) { sout<<"no transfer map"<GetShape(a1); - if (Shape.IsNull()) { sout<<"Not a DRAW Shape:"<Length(); - sout<Model(); sout<<"("; for (i = 1; i <= nb; i ++) { if (i > 1) sout<<","; sout<Number(list->Value(i)); } - sout<<")"<NbWords(); Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc < 4) { - sout<<"Give : filename or . for current model; varname or . to take fileroot\n GiveList, * for all transferrable roots"<Arg(1); @@ -568,9 +568,9 @@ static IFSelect_ReturnStatus XSControl_trimport TCollection_AsciiString fnom,rnom; Standard_Boolean modfic = XSControl_FuncShape::FileAndVar (WS,arg1,arg2,"IMPORT",fnom,rnom); - if (modfic) sout<<" File to read : "<CommandPart (3); @@ -582,9 +582,9 @@ static IFSelect_ReturnStatus XSControl_trimport comload.AssignCat(arg1); IFSelect_ReturnStatus status = pilot->Execute(comload); if (status != IFSelect_RetDone) - { sout<<"Abandon import"<GiveList (compart.ToCString()); } - if (list.IsNull()) { sout<<"No list defined. Abandon"<Length(); - sout<<"Nb entities selected : "<InitTransferReader (0); const Handle(XSControl_TransferReader) &TR = WS->TransferReader(); - if (TR.IsNull()) { sout<<" init not done or failed"<BeginTransfer(); // Transferring Standard_Integer nbt = TR->TransferList(list); - sout<<"Nb Entities Selected : "<Arg(0)[5] == 'c'); @@ -621,7 +621,7 @@ static IFSelect_ReturnStatus XSControl_trimport BRep_Builder B; B.MakeCompound (C); Handle(Interface_InterfaceModel) mdl = TR->Model(); - if (mdl.IsNull()) { sout<<" modele absent"<Value(il); sh = TR->ShapeResult(ent); @@ -634,15 +634,15 @@ static IFSelect_ReturnStatus XSControl_trimport XSControl::Vars(pilot)->SetShape(nomsh,sh); } } - if (nbs == 0) sout<<"No Shape produced"<SetShape(rnom.ToCString(),sh); } else if (iscomp) { - sout<<"One compound made of "<SetShape(rnom.ToCString(),C); } else { // several individual shapes - sout<TransferWriter(); - if (argc < 2) { sout<<" donner nom de shape draw"<Arg(i); TopoDS_Shape Shape = XSControl::Vars(pilot)->GetShape(ai); - if (Shape.IsNull()) { sout<<"pas un nom de shape draw:"<TransferWriteShape (XSControl::Session(pilot)->Model(),Shape); - sout<<" Transfer Write Status = "<Append (li); @@ -785,12 +785,12 @@ Standard_Integer XSControl_FuncShape::MoreShapes list->Append(Shape); nbsh ++; } - sout<<" -> taken "< taken "<Vars()->GetShape(a1); - if (Shape.IsNull()) { sout<<"not a shape draw:"<Append(Shape); return 1; } diff --git a/src/XSControl/XSControl_Functions.cxx b/src/XSControl/XSControl_Functions.cxx index 970529952c..463bb2e498 100644 --- a/src/XSControl/XSControl_Functions.cxx +++ b/src/XSControl/XSControl_Functions.cxx @@ -47,7 +47,7 @@ static IFSelect_ReturnStatus XSControl_xinit(const Handle(IFSelect_SessionPilot) if (argc > 1) return (XSControl::Session(pilot)->SelectNorm(arg1) ? IFSelect_RetDone : IFSelect_RetFail); Message_Messenger::StreamBuffer sout = Message::SendInfo(); - sout<<"Selected Norm:"<SelectedNorm()<SelectedNorm()<<'\n'; return IFSelect_RetVoid; } @@ -64,22 +64,22 @@ static IFSelect_ReturnStatus XSControl_xnorm(const Handle(IFSelect_SessionPilot) Handle(XSControl_Controller) control = WS->NormAdaptor(); Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc == 1) - sout<<"Current Norm. xnorm newnorm to change"<Name(Standard_False)<Name(Standard_True)<Name(Standard_False)<<'\n' + << " Short name (resource) : "<Name(Standard_True)<<'\n'; if (argc == 1) return IFSelect_RetVoid; control = XSControl_Controller::Recorded(arg1); if (control.IsNull()) { - sout<<" No norm named : "<SetController(control); - sout<<"new norm : "<Name()<Name()<<'\n'; return IFSelect_RetDone; } @@ -92,7 +92,7 @@ static IFSelect_ReturnStatus XSControl_newmodel(const Handle(IFSelect_SessionPil // **** newmodel **** if (!XSControl::Session(pilot)->NewModel().IsNull()) return IFSelect_RetDone; Message_Messenger::StreamBuffer sout = Message::SendInfo(); - sout<<"No new Model produced"<TransferWriter()->FinderProcess(); const Handle(Transfer_TransientProcess) &TP = XSControl::Session(pilot)->TransferReader()->TransientProcess(); Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (modew) { if(!FP.IsNull()) FP->Clear(); else sout<<"No Transfer Write"<Clear(); else sout<<"No Transfer Read"<Clear(); else sout<<"No Transfer Write"<<'\n'; } + else { if(!TP.IsNull()) TP->Clear(); else sout<<"No Transfer Read"<<'\n'; } return IFSelect_RetDone; } @@ -123,7 +123,7 @@ static IFSelect_ReturnStatus XSControl_tpstat(const Handle(IFSelect_SessionPilot //const Standard_CString arg2 = pilot->Arg(2); const Handle(Transfer_TransientProcess) &TP = XSControl::Session(pilot)->TransferReader()->TransientProcess(); Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (TP.IsNull()) { sout<<"No Transfer Read"<PrintStats (1,sout); } - else sout<<"TransferRead : not defined"<TransferReader()->TransientProcess(); // **** tpent **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (TP.IsNull()) { sout<<"No Transfer Read"<Model(); if (model.IsNull()) return IFSelect_RetFail; - if (argc < 2) { sout<<"Give ENTITY NUMBER (IN MODEL TransferProcess)"< model->NbEntities()) { sout<<"Number not in [1 - "<NbEntities()<<"]"< model->NbEntities()) { sout<<"Number not in [1 - "<NbEntities()<<"]"<<'\n'; return IFSelect_RetError; } Handle(Standard_Transient) ent = model->Value(num); Standard_Integer index = TP->MapIndex (ent); - if (index == 0) sout<<"Entity "<PrintTransferStatus (index,Standard_False,sout); return IFSelect_RetVoid; } @@ -227,7 +227,7 @@ static IFSelect_ReturnStatus XSControl_tpitem(const Handle(IFSelect_SessionPilot const Standard_CString arg1 = pilot->Arg(1); // **** tpitem/tproot/twitem/twroot **** Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (argc < 2) { sout<<"Give ITEM NUMBER (in TransferProcess)"<Word(0).Value(3) == 'r') num = -num; Standard_Boolean modew = Standard_False; @@ -237,7 +237,7 @@ static IFSelect_ReturnStatus XSControl_tpitem(const Handle(IFSelect_SessionPilot Handle(Standard_Transient) ent; if (!XSControl::Session(pilot)->PrintTransferStatus(num,modew,sout)) { - sout<<" - Num="<NbRoots(); - sout<<" Recording "<Root(i); - if (TR->RecordResult (ent)) sout<<" Root n0."<RecordResult (ent)) sout<<" Root n0."< mdl->NbEntities()) sout<<"incorrect number:"<RecordResult(mdl->Value(num))) sout<<" Entity n0."< mdl->NbEntities()) sout<<"incorrect number:"<RecordResult(mdl->Value(num))) sout<<" Entity n0."<TransferReader(); - if (TR.IsNull()) { sout<<" init not done"<Model(); - if (mdl.IsNull()) { sout<<" No model"<FileName()<FileName()<<'\n'; if (argc == 1) { // stats generales TR->PrintStats (sout, 10, 0); } else { // stats unitaires Standard_Integer num = atoi(arg1); - if (num < 1 || num > mdl->NbEntities()) { sout<<" incorrect number:"< mdl->NbEntities()) { sout<<" incorrect number:"<Value(num); - if (!TR->IsRecorded(ent)) { sout<<" Entity "<IsRecorded(ent)) { sout<<" Entity "<FinalResult(ent); Handle(TColStd_HSequenceOfTransient) list = TR->CheckedList(ent); Standard_Integer i, nb = list->Length(); if (nb > 0) sout<<" Entities implied by Check/Result :"<Print(list->Value(i), sout); } - sout<CheckList(Standard_False); pilot->Session()->PrintCheckList (sout, chl, Standard_False, IFSelect_EntitiesByItem); } @@ -330,7 +330,7 @@ static IFSelect_ReturnStatus XSControl_trbegin(const Handle(IFSelect_SessionPilo TR = XSControl::Session(pilot)->TransferReader(); if (TR.IsNull()) { Message_Messenger::StreamBuffer sout = Message::SendInfo(); - sout<<" init not done or failed"<TransferReader(); - if (TR.IsNull()) { sout<<" init not done"<Model(); - if (mdl.IsNull()) { sout<<" No model"<Session()->NamedItem("xst-model-roots")); Handle(Standard_Transient) sel = pilot->Session()->NamedItem("xst-model-roots"); - if (sel.IsNull()) { sout<<"Select Roots absent"<Session()->GiveList(sel); - sout<<" Transferring all roots i.e. : "<TransferList(list)<TransferList(list)<<'\n'; } else { Handle(TColStd_HSequenceOfTransient) list = IFSelect_Functions::GiveList(pilot->Session(),pilot->CommandPart(1)); - sout<<" Transfer of "<Length()<<" entities"<Length()<<" entities"<<'\n'; Standard_Integer nb = TR->TransferList(list); - sout<<" Gives "< TProcess **** const Handle(XSControl_TransferReader) &TR = XSControl::Session(pilot)->TransferReader(); Message_Messenger::StreamBuffer sout = Message::SendInfo(); - if (TR.IsNull()) sout<<" No TransferReader"<TransientProcess().IsNull()) sout<<" Transfer Reader without Process"<TransientProcess().IsNull()) sout<<" Transfer Reader without Process"<<'\n'; return IFSelect_RetVoid; } @@ -407,17 +407,17 @@ static IFSelect_ReturnStatus XSControl_twmode(const Handle(IFSelect_SessionPilot Standard_Integer modemin,modemax; Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (control->ModeWriteBounds (modemin,modemax)) { - sout<<"Write Mode : allowed values "<ModeWriteHelp (modd)<ModeWriteHelp (modd)<<'\n'; } } - sout<<"Write Mode : actual = "<TransferMode()< "< "<SetTransferMode(mod); - if (!control->IsModeWrite (mod)) sout<<"Warning : this new value is not supported"<IsModeWrite (mod)) sout<<"Warning : this new value is not supported"<<'\n'; return IFSelect_RetDone; } @@ -439,7 +439,7 @@ static IFSelect_ReturnStatus XSControl_twstat(const Handle(IFSelect_SessionPilot // XSControl_TransferWriter::PrintStatsProcess (FP,mod1,mod2); FP->PrintStats (1,sout); } - else sout<<"TransferWrite: not defined"<Number(ent); Handle(TCollection_HAsciiString) lab = myModel->StringLabel(ent); sout<<"\n*******************************************************************\n"; - sout << "****** Transferring one Entity ******"<ToCString() @@ -852,7 +852,7 @@ Standard_Integer XSControl_TransferReader::TransferList if (level > 0) { Message_Messenger::StreamBuffer sout = myTP->Messenger()->SendInfo(); sout<<"\n*******************************************************************\n"; - sout << "****** Transferring a list of "<Messenger()->SendInfo(); sout<<"\n*******************************************************************\n"; - sout << "****** Transferring the "< 10) { sout<<" *** Not yet implemented"< 10) { sout<<" *** Not yet implemented"<<'\n'; return; } if (what < 10) { - sout << "****** Data recorded on Last Transfer ******"<Length(); Handle(IFSelect_SignatureList) counter; @@ -1001,7 +1001,7 @@ void XSControl_TransferReader::PrintStats (Standard_OStream& sout, } if (!counter.IsNull()) counter->PrintList (sout, myModel, pcm); - sout<SendInfo(); aSender<<"****** "<PrintStats(0,sout); return; } sout<<"\n*******************************************************************\n"; - sout << "****** Statistics on Transfer Process (Read) ******"<NbEntities()<NbEntities()<<'\n'; + sout <<"**** Nb Items (Transfer) : "<Print (ent, sout); - sout<<" "<TypeName(ent,Standard_False)<<" (not recorded)"<TypeName(ent,Standard_False)<<" (not recorded)"<<'\n'; continue; } } @@ -1226,7 +1226,7 @@ void XSControl_TransferReader::PrintStatsOnList(const Handle(Transfer_TransientP sout<<"["<Print (ent, sout); sout<<" "<TypeName(ent,Standard_False); - sout<<" Result:"<Check(); @@ -1234,11 +1234,11 @@ void XSControl_TransferReader::PrintStatsOnList(const Handle(Transfer_TransientP if (newnbw > 0) { sout<<" - Warnings : "<CWarning(newi)<CWarning(newi)<<'\n'; } if (newnbf > 0) { sout<<" - Fails : "<CFail(newi)<CFail(newi)<<'\n'; } continue; } @@ -1265,10 +1265,10 @@ void XSControl_TransferReader::PrintStatsOnList(const Handle(Transfer_TransientP // Fin de l iteration } if (!counter.IsNull()) counter->PrintList (sout, model, pcm); - else sout< 0) { - sout << "****** Percentages according Transfer Status ******"<Messenger(),"Result ",nbr+nbrw,nl); PrintPercent (TP->Messenger(),"Result + FAIL ",nbrf,nl); PrintPercent (TP->Messenger(),"FAIL, no Result ",nbf,nl); diff --git a/src/XSControl/XSControl_TransferWriter.cxx b/src/XSControl/XSControl_TransferWriter.cxx index ec6871d8f7..07366fc328 100644 --- a/src/XSControl/XSControl_TransferWriter.cxx +++ b/src/XSControl/XSControl_TransferWriter.cxx @@ -53,12 +53,12 @@ void XSControl_TransferWriter::PrintStats (const Standard_Integer , const Standa Message_Messenger::StreamBuffer sout = myTransferWriter->Messenger()->SendInfo(); // A ameliorer ... ! sout<<"\n*******************************************************************\n"; - sout << "****** Statistics on Transfer (Write) ******"<DynamicType()->Name()<<" ******"<<'\n'; status = myController->TransferWriteTransient (obj,myTransferWriter,model, myTransferMode, theProgress); } catch(Standard_Failure const& anException) { sout<<"**** **** TransferWriteShape, EXCEPTION : "; sout<TransferWriteShape (aShape,myTransferWriter, theModel, myTransferMode, theProgress); } catch(Standard_Failure const& anException) { sout<<"**** **** TransferWriteShape, EXCEPTION : "; sout<Length(); for (i = 1; i <= nb; i ++) - if (!linha->Value(i).IsNull()) sout<Value(i)->ToCString()<Value(i).IsNull()) sout<Value(i)->ToCString()<<'\n'; return; } DeclareAndCast(TColStd_HSequenceOfAsciiString,lina,lines); if (!lina.IsNull()) { nb = lina->Length(); for (i = 1; i <= nb; i ++) - sout<Value(i).ToCString()<Value(i).ToCString()<<'\n'; return; } DeclareAndCast(TColStd_HSequenceOfHExtendedString,linhe,lines); @@ -80,14 +80,14 @@ static const Standard_ExtString voidext = { 0 }; nb = linhe->Length(); for (i = 1; i <= nb; i ++) if (!linhe->Value(i).IsNull()) - sout << linhe->Value(i)->String() << std::endl; + sout << linhe->Value(i)->String() << '\n'; return; } DeclareAndCast(TColStd_HSequenceOfExtendedString,linee,lines); if (!linee.IsNull()) { nb = linee->Length(); for (i = 1; i <= nb; i ++) - sout << linee->Value(i) << std::endl; + sout << linee->Value(i) << '\n'; return; } DeclareAndCast(TCollection_HAsciiString,lin1a,lines); diff --git a/src/XSControl/XSControl_WorkSession.cxx b/src/XSControl/XSControl_WorkSession.cxx index 07ff5ce3eb..cbebdc1caa 100644 --- a/src/XSControl/XSControl_WorkSession.cxx +++ b/src/XSControl/XSControl_WorkSession.cxx @@ -200,16 +200,16 @@ Standard_Boolean XSControl_WorkSession::PrintTransferStatus(const Standard_Inte { S<<" ** Transfer Root n0."<FindTransient(finder); - S<<" -> Type "<DynamicType()->Name()< Type "<DynamicType()->Name()<<'\n'; FP->StartTrace (binder,finder,0,0); // pb sout/S if (!ent.IsNull()) { S<<" ** Resultat Transient, type "<DynamicType()->Name(); const Handle(Interface_InterfaceModel) &model = Model(); if (!model.IsNull()) { S<<" In output Model, Entity "; model->Print(ent, S); } - S<Model(); - if (model.IsNull()) std::cout<<"No Model"<NbMapped() ,maxr = TP->NbRoots(); @@ -239,10 +239,10 @@ Standard_Boolean XSControl_WorkSession::PrintTransferStatus(const Standard_Inte { S<<" ** Transfer Root n0."<Print(ent, S); } binder = TP->MapItem (ne); - S<StartTrace (binder,ent,0,0); } @@ -253,11 +253,11 @@ Standard_Boolean XSControl_WorkSession::PrintTransferStatus(const Standard_Inte Standard_Integer i,nbw = ch->NbWarnings(), nbf = ch->NbFails(); if (nbw > 0) { S<<" - Warnings : "<CWarning(i)<CWarning(i)<<'\n'; } if (nbf > 0) { S<<" - Fails : "<CFail(i)<CFail(i)<<'\n'; } } return Standard_True; diff --git a/src/XSDRAW/XSDRAW.cxx b/src/XSDRAW/XSDRAW.cxx index 79fe1e8d11..b38f8c86a7 100644 --- a/src/XSDRAW/XSDRAW.cxx +++ b/src/XSDRAW/XSDRAW.cxx @@ -212,9 +212,9 @@ void XSDRAW::LoadDraw (Draw_Interpretor& theCommands) void XSDRAW::SetController (const Handle(XSControl_Controller)& control) { if (thepilot.IsNull()) XSDRAW::LoadSession(); - if (control.IsNull()) std::cout<<"XSTEP Controller not defined"<SetController (control); - else std::cout<<"XSTEP Session badly or not defined"<GiveList(""); - if (list.IsNull()) { std::cout << "No list defined" << std::endl; continue; } + if (list.IsNull()) { std::cout << "No list defined" << '\n'; continue; } } Standard_Integer nbl = list->Length(); diff --git a/src/XSDRAWSTL/XSDRAWSTL_DataSource.cxx b/src/XSDRAWSTL/XSDRAWSTL_DataSource.cxx index 603dec6edf..cef9ca77ee 100644 --- a/src/XSDRAWSTL/XSDRAWSTL_DataSource.cxx +++ b/src/XSDRAWSTL/XSDRAWSTL_DataSource.cxx @@ -33,7 +33,7 @@ XSDRAWSTL_DataSource::XSDRAWSTL_DataSource (const Handle(Poly_Triangulation)& aM { const Standard_Integer aNbNodes = myMesh->NbNodes(); myNodeCoords = new TColStd_HArray2OfReal (1, aNbNodes, 1, 3); - std::cout << "Nodes : " << aNbNodes << std::endl; + std::cout << "Nodes : " << aNbNodes << '\n'; for (Standard_Integer i = 1; i <= aNbNodes; i++) { @@ -49,7 +49,7 @@ XSDRAWSTL_DataSource::XSDRAWSTL_DataSource (const Handle(Poly_Triangulation)& aM myElemNormals = new TColStd_HArray2OfReal(1, aNbTris, 1, 3); myElemNodes = new TColStd_HArray2OfInteger(1, aNbTris, 1, 3); - std::cout << "Elements : " << aNbTris << std::endl; + std::cout << "Elements : " << aNbTris << '\n'; for (Standard_Integer i = 1; i <= aNbTris; i++) { @@ -83,7 +83,7 @@ XSDRAWSTL_DataSource::XSDRAWSTL_DataSource (const Handle(Poly_Triangulation)& aM myElemNormals->SetValue (i, 3, aN.Z()); } } - std::cout << "Construction is finished" << std::endl; + std::cout << "Construction is finished" << '\n'; } //================================================================ diff --git a/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx b/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx index 80a4e15727..0427bef07c 100644 --- a/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx +++ b/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx @@ -211,7 +211,7 @@ void XmlLDrivers_DocumentRetrievalDriver::Read (Standard_IStream& t if (aParser.parse(theIStream, Standard_False, aWithoutRoot)) { TCollection_AsciiString aData; - std::cout << aParser.GetError(aData) << ": " << aData << std::endl; + std::cout << aParser.GetError(aData) << ": " << aData << '\n'; myReaderStatus = PCDM_RS_FormatFailure; return; } diff --git a/src/math/math_BissecNewton.cxx b/src/math/math_BissecNewton.cxx index 88eecc5a2e..ebd44f5f0a 100644 --- a/src/math/math_BissecNewton.cxx +++ b/src/math/math_BissecNewton.cxx @@ -159,8 +159,8 @@ void math_BissecNewton::Dump(Standard_OStream& o) const { o << "math_BissecNewton "; if(Done) { o << " Status = Done \n"; - o << " The Root is: " << x << std::endl; - o << " The value at this Root is: " << f << std::endl; + o << " The Root is: " << x << '\n'; + o << " The value at this Root is: " << f << '\n'; } else { o << " Status = not Done \n"; diff --git a/src/math/math_BracketMinimum.cxx b/src/math/math_BracketMinimum.cxx index 39e0c8a623..57dee77e54 100644 --- a/src/math/math_BracketMinimum.cxx +++ b/src/math/math_BracketMinimum.cxx @@ -240,10 +240,10 @@ Standard_Boolean math_BracketMinimum::LimitAndMayBeSwap o << "math_BracketMinimum "; if(Done) { o << " Status = Done \n"; - o << " The bracketed triplet is: " << std::endl; - o << Ax << ", " << Bx << ", " << Cx << std::endl; - o << " The corresponding function values are: "<< std::endl; - o << FAx << ", " << FBx << ", " << FCx << std::endl; + o << " The bracketed triplet is: " << '\n'; + o << Ax << ", " << Bx << ", " << Cx << '\n'; + o << " The corresponding function values are: "<< '\n'; + o << FAx << ", " << FBx << ", " << FCx << '\n'; } else { o << " Status = not Done \n"; diff --git a/src/math/math_BracketedRoot.cxx b/src/math/math_BracketedRoot.cxx index 29e9a6be0a..9d1ec6b2e1 100644 --- a/src/math/math_BracketedRoot.cxx +++ b/src/math/math_BracketedRoot.cxx @@ -107,9 +107,9 @@ math_BracketedRoot::math_BracketedRoot (math_Function& F, o << "math_BracketedRoot "; if(Done) { o << " Status = Done \n"; - o << " Number of iterations = " << NbIter << std::endl; - o << " The Root is: " << TheRoot << std::endl; - o << " The value at the root is: " << TheError << std::endl; + o << " Number of iterations = " << NbIter << '\n'; + o << " The Root is: " << TheRoot << '\n'; + o << " The value at the root is: " << TheError << '\n'; } else { o << " Status = not Done \n"; diff --git a/src/math/math_FunctionAllRoots.cxx b/src/math/math_FunctionAllRoots.cxx index b5c680b7f1..a9d5801291 100644 --- a/src/math/math_FunctionAllRoots.cxx +++ b/src/math/math_FunctionAllRoots.cxx @@ -221,8 +221,8 @@ void math_FunctionAllRoots::Dump(Standard_OStream& o) const { o<< "math_FunctionAllRoots "; if(done) { o<< " Status = Done \n"; - o << " Number of null intervals = " << pdeb.Length() << std::endl; - o << " Number of points where the function is null: " << piso.Length() << std::endl; + o << " Number of null intervals = " << pdeb.Length() << '\n'; + o << " Number of points where the function is null: " << piso.Length() << '\n'; } else { o<< " Status = not Done \n"; diff --git a/src/math/math_FunctionRoot.cxx b/src/math/math_FunctionRoot.cxx index 397f06de78..9f229bd43a 100644 --- a/src/math/math_FunctionRoot.cxx +++ b/src/math/math_FunctionRoot.cxx @@ -114,9 +114,9 @@ class math_MyFunctionSetWithDerivatives : public math_FunctionSetWithDerivatives o<< "math_FunctionRoot "; if(Done) { o<< " Status = Done \n"; - o << " Number of iterations = " << NbIter << std::endl; - o << " The Root is: " << TheRoot << std::endl; - o << "The value at the root is: " << TheError << std::endl; + o << " Number of iterations = " << NbIter << '\n'; + o << " The Root is: " << TheRoot << '\n'; + o << "The value at the root is: " << TheError << '\n'; } else { o<< " Status = not Done \n"; diff --git a/src/math/math_FunctionRoots.cxx b/src/math/math_FunctionRoots.cxx index 0f9b9ee8aa..e9561519ed 100644 --- a/src/math/math_FunctionRoots.cxx +++ b/src/math/math_FunctionRoots.cxx @@ -1080,9 +1080,9 @@ void math_FunctionRoots::Dump(Standard_OStream& o) const o << "math_FunctionRoots "; if(Done) { o << " Status = Done \n"; - o << " Number of solutions = " << Sol.Length() << std::endl; + o << " Number of solutions = " << Sol.Length() << '\n'; for (Standard_Integer i = 1; i <= Sol.Length(); i++) { - o << " Solution Number " << i << "= " << Sol.Value(i) << std::endl; + o << " Solution Number " << i << "= " << Sol.Value(i) << '\n'; } } else { diff --git a/src/math/math_Gauss.cxx b/src/math/math_Gauss.cxx index 7760db66f8..c2132e382a 100644 --- a/src/math/math_Gauss.cxx +++ b/src/math/math_Gauss.cxx @@ -107,7 +107,7 @@ void math_Gauss::Dump(Standard_OStream& o) const { o << "math_Gauss "; if(Done) { o<< " Status = Done \n"; - o << " Determinant of A = " << D << std::endl; + o << " Determinant of A = " << D << '\n'; } else { o << " Status = not Done \n"; diff --git a/src/math/math_Jacobi.cxx b/src/math/math_Jacobi.cxx index e076b4b1fa..53ac034ea6 100644 --- a/src/math/math_Jacobi.cxx +++ b/src/math/math_Jacobi.cxx @@ -47,7 +47,7 @@ void math_Jacobi::Dump(Standard_OStream& o) const { o <<"math_Jacobi "; if (Done) { o << " Status = Done \n"; - o << " The eigenvalues vector is: " << EigenValues << std::endl; + o << " The eigenvalues vector is: " << EigenValues << '\n'; } else { o << "Status = not Done \n"; diff --git a/src/math/math_NewtonMinimum.cxx b/src/math/math_NewtonMinimum.cxx index 89ae93f952..2939e3866b 100644 --- a/src/math/math_NewtonMinimum.cxx +++ b/src/math/math_NewtonMinimum.cxx @@ -257,13 +257,13 @@ void math_NewtonMinimum::Perform(math_MultipleVarFunctionWithHessian& F, void math_NewtonMinimum::Dump(Standard_OStream& o) const { o<< "math_Newton Optimisation: "; - o << " Done =" << Done << std::endl; - o << " Status = " << (Standard_Integer)TheStatus << std::endl; - o << " Location Vector = " << Location() << std::endl; - o << " Minimum value = "<< Minimum()<< std::endl; - o << " Previous value = "<< PreviousMinimum << std::endl; - o << " Number of iterations = " <