From 8082b955bd8d214620b71b949a5dc9857c2f45a0 Mon Sep 17 00:00:00 2001 From: dpasukhi Date: Sun, 22 Sep 2024 12:33:29 +0000 Subject: [PATCH] Coding - Reorganize code with constexpr #68 After rework Precision.hxx some local variables can be marked as constexpr --- src/AIS/AIS_ColorScale.cxx | 2 +- src/Adaptor3d/Adaptor3d_CurveOnSurface.cxx | 22 ++-- src/AdvApprox/AdvApprox_DichoCutting.cxx | 2 +- src/AdvApprox/AdvApprox_PrefAndRec.cxx | 2 +- src/AdvApprox/AdvApprox_PrefCutting.cxx | 2 +- src/AppDef/AppDef_Variational.cxx | 6 +- src/Approx/Approx_ComputeLine.gxx | 2 +- src/ApproxInt/ApproxInt_ImpPrmSvSurfaces.gxx | 2 +- src/ApproxInt/ApproxInt_MultiLine.gxx | 2 +- src/BOPTools/BOPTools_AlgoTools.cxx | 4 +- src/BOPTools/BOPTools_AlgoTools2D.cxx | 2 +- src/BRep/BRep_Tool.cxx | 6 +- src/BRepBndLib/BRepBndLib_1.cxx | 2 +- src/BRepCheck/BRepCheck_Edge.cxx | 4 +- src/BRepClass/BRepClass_FaceExplorer.cxx | 2 +- src/BRepClass3d/BRepClass3d_SolidExplorer.cxx | 4 +- src/BRepExtrema/BRepExtrema_DistanceSS.cxx | 8 +- .../BRepExtrema_ProximityValueTool.cxx | 2 +- src/BRepFeat/BRepFeat.cxx | 2 +- src/BRepFeat/BRepFeat_Form.cxx | 2 +- src/BRepFeat/BRepFeat_MakePrism.cxx | 4 +- src/BRepFeat/BRepFeat_MakeRevol.cxx | 4 +- src/BRepFill/BRepFill_Evolved.cxx | 2 +- src/BRepFill/BRepFill_Generator.cxx | 2 +- src/BRepFill/BRepFill_MultiLine.cxx | 10 +- src/BRepFill/BRepFill_NSections.cxx | 2 +- src/BRepFill/BRepFill_OffsetWire.cxx | 10 +- src/BRepFill/BRepFill_SectionPlacement.cxx | 7 +- src/BRepFill/BRepFill_TrimEdgeTool.cxx | 6 +- src/BRepGProp/BRepGProp_Face.cxx | 2 +- src/BRepLib/BRepLib.cxx | 2 +- src/BRepLib/BRepLib_FuseEdges.cxx | 4 +- src/BRepLib/BRepLib_MakeEdge.cxx | 4 +- src/BRepLib/BRepLib_MakeEdge2d.cxx | 4 +- src/BRepLib/BRepLib_MakeFace.cxx | 2 +- src/BRepLib/BRepLib_MakeShell.cxx | 4 +- src/BRepLib/BRepLib_ToolTriangulatedShape.cxx | 2 +- src/BRepMAT2d/BRepMAT2d_Explorer.cxx | 2 +- src/BRepMesh/BRepMesh_Classifier.cxx | 4 +- src/BRepMesh/BRepMesh_CurveTessellator.cxx | 2 +- src/BRepMesh/BRepMesh_GeomTool.cxx | 4 +- src/BRepMesh/BRepMesh_VertexTool.cxx | 2 +- src/BRepOffset/BRepOffset.cxx | 2 +- src/BRepOffset/BRepOffset_Inter2d.cxx | 6 +- src/BRepOffset/BRepOffset_MakeOffset.cxx | 2 +- src/BRepOffset/BRepOffset_Offset.cxx | 2 +- src/BRepOffset/BRepOffset_Tool.cxx | 12 +-- .../BRepOffsetAPI_MiddlePath.cxx | 2 +- .../BRepOffsetAPI_ThruSections.cxx | 2 +- src/BRepSweep/BRepSweep_Trsf.cxx | 6 +- src/BRepTest/BRepTest_CurveCommands.cxx | 2 +- src/BRepTest/BRepTest_OtherCommands.cxx | 2 +- src/BRepTools/BRepTools.cxx | 4 +- src/BiTgte/BiTgte_Blend.cxx | 6 +- src/Bisector/Bisector_BisecAna.cxx | 2 +- src/Bisector/Bisector_BisecCC.cxx | 6 +- src/Bisector/Bisector_BisecPC.cxx | 4 +- src/Bisector/Bisector_Inter.cxx | 2 +- src/BndLib/BndLib.cxx | 6 +- src/BndLib/BndLib_Add2dCurve.cxx | 2 +- .../ChFiKPart_ComputeData_FilPlnCyl.cxx | 2 +- src/Contap/Contap_Contour.cxx | 2 +- src/Draft/Draft_Modification.cxx | 2 +- src/Draft/Draft_Modification_1.cxx | 4 +- src/DsgPrs/DsgPrs.cxx | 2 +- src/Extrema/Extrema_ExtElCS.cxx | 2 +- src/Extrema/Extrema_ExtPElC.cxx | 2 +- src/Extrema/Extrema_FuncExtCS.cxx | 2 +- src/Extrema/Extrema_FuncPSNorm.cxx | 2 +- src/Extrema/Extrema_GExtPC.gxx | 2 +- src/Extrema/Extrema_GenExtCS.cxx | 2 +- src/Extrema/Extrema_GenLocateExtPS.cxx | 2 +- src/Extrema/Extrema_GlobOptFuncCQuadric.cxx | 4 +- src/Extrema/Extrema_GlobOptFuncConicS.cxx | 2 +- src/GCPnts/GCPnts_TangentialDeflection.cxx | 8 +- src/GccAna/GccAna_Circ2dBisec.cxx | 2 +- src/Geom/Geom_OffsetSurface.cxx | 4 +- src/Geom2dGcc/Geom2dGcc_Circ2d2TanRadGeo.cxx | 2 +- src/GeomAPI/GeomAPI_ExtremaCurveCurve.cxx | 4 +- src/GeomAPI/GeomAPI_ExtremaCurveSurface.cxx | 4 +- src/GeomAPI/GeomAPI_ExtremaSurfaceSurface.cxx | 4 +- src/GeomAPI/GeomAPI_ProjectPointOnSurf.cxx | 4 +- src/GeomAdaptor/GeomAdaptor_Surface.cxx | 2 +- .../GeomAdaptor_SurfaceOfRevolution.cxx | 8 +- .../GeomConvert_CurveToAnaCurve.cxx | 2 +- src/GeomConvert/GeomConvert_SurfToAnaSurf.cxx | 4 +- src/GeomFill/GeomFill_BSplineCurves.cxx | 4 +- src/GeomFill/GeomFill_BezierCurves.cxx | 6 +- src/GeomFill/GeomFill_CircularBlendFunc.cxx | 4 +- src/GeomFill/GeomFill_DiscreteTrihedron.cxx | 2 +- src/GeomFill/GeomFill_Frenet.cxx | 6 +- src/GeomFill/GeomFill_NSections.cxx | 6 +- src/GeomFill/GeomFill_Pipe.cxx | 4 +- src/GeomInt/GeomInt_IntSS_1.cxx | 6 +- src/GeomInt/GeomInt_LineConstructor.cxx | 4 +- src/GeomInt/GeomInt_LineTool.cxx | 2 +- src/GeomLib/GeomLib.cxx | 4 +- src/GeomLib/GeomLib_IsPlanarSurface.cxx | 2 +- src/GeomLib/GeomLib_Tool.cxx | 2 +- src/GeomToIGES/GeomToIGES_GeomCurve.cxx | 2 +- .../GeometryTest_CurveCommands.cxx | 4 +- src/HLRAlgo/HLRAlgo_PolyAlgo.cxx | 2 +- src/HLRBRep/HLRBRep.cxx | 2 +- src/IGESToBRep/IGESToBRep_BasicCurve.cxx | 4 +- src/IntAna/IntAna_Curve.cxx | 4 +- src/IntAna/IntAna_IntQuadQuad.cxx | 2 +- src/IntCurveSurface/IntCurveSurface_Inter.gxx | 4 +- src/IntPatch/IntPatch_GLine.cxx | 4 +- src/IntPatch/IntPatch_ImpPrmIntersection.cxx | 8 +- src/IntPatch/IntPatch_Intersection.cxx | 6 +- src/IntPatch/IntPatch_PointLine.cxx | 4 +- src/IntPatch/IntPatch_PrmPrmIntersection.cxx | 2 +- src/IntPatch/IntPatch_WLine.cxx | 2 +- src/IntPatch/IntPatch_WLineTool.cxx | 2 +- src/IntWalk/IntWalk_PWalking.cxx | 4 +- src/LocOpe/LocOpe_FindEdgesInFace.cxx | 4 +- src/LocOpe/LocOpe_Generator.cxx | 12 +-- src/LocOpe/LocOpe_WiresOnShape.cxx | 12 +-- src/MAT2d/MAT2d_Circuit.cxx | 4 +- src/MAT2d/MAT2d_CutCurve.cxx | 4 +- src/MeshVS/MeshVS_MeshPrsBuilder.cxx | 101 +++++++++--------- src/MeshVS/MeshVS_Tool.cxx | 8 +- src/ProjLib/ProjLib_CompProjectedCurve.cxx | 2 +- src/ProjLib/ProjLib_ComputeApprox.cxx | 2 +- .../ProjLib_ComputeApproxOnPolarSurface.cxx | 2 +- src/ProjLib/ProjLib_ProjectOnSurface.cxx | 2 +- src/ProjLib/ProjLib_ProjectedCurve.cxx | 2 +- src/ProjLib/ProjLib_Sphere.cxx | 2 +- src/PrsDim/PrsDim_EqualDistanceRelation.cxx | 6 +- src/PrsDim/PrsDim_FixRelation.cxx | 2 +- src/PrsDim/PrsDim_IdenticRelation.cxx | 16 +-- src/PrsDim/PrsDim_MidPointRelation.cxx | 4 +- src/QABugs/QABugs_10.cxx | 2 +- src/QABugs/QABugs_11.cxx | 4 +- src/QABugs/QABugs_13.cxx | 2 +- src/QABugs/QABugs_19.cxx | 4 +- src/QABugs/QABugs_20.cxx | 4 +- src/SWDRAW/SWDRAW_ShapeTool.cxx | 2 +- src/ShapeAlgo/ShapeAlgo_AlgoContainer.cxx | 4 +- .../ShapeAnalysis_CanonicalRecognition.cxx | 2 +- src/ShapeAnalysis/ShapeAnalysis_Edge.cxx | 2 +- src/ShapeAnalysis/ShapeAnalysis_Surface.cxx | 8 +- .../ShapeAnalysis_TransferParametersProj.cxx | 4 +- src/ShapeAnalysis/ShapeAnalysis_WireOrder.cxx | 4 +- .../ShapeConstruct_ProjectCurveOnSurface.cxx | 2 +- src/ShapeCustom/ShapeCustom_Curve2d.cxx | 2 +- src/ShapeFix/ShapeFix_ComposeShell.cxx | 2 +- src/ShapeFix/ShapeFix_Edge.cxx | 4 +- src/ShapeFix/ShapeFix_EdgeProjAux.cxx | 2 +- src/ShapeFix/ShapeFix_Solid.cxx | 2 +- src/ShapeFix/ShapeFix_Wire_1.cxx | 4 +- src/ShapeFix/ShapeFix_Wireframe.cxx | 4 +- .../ShapeUpgrade_ConvertCurve2dToBezier.cxx | 4 +- .../ShapeUpgrade_ConvertCurve3dToBezier.cxx | 4 +- ...apeUpgrade_ConvertSurfaceToBezierBasis.cxx | 6 +- .../ShapeUpgrade_ShapeConvertToBezier.cxx | 2 +- src/ShapeUpgrade/ShapeUpgrade_SplitCurve.cxx | 2 +- .../ShapeUpgrade_SplitCurve2d.cxx | 2 +- .../ShapeUpgrade_SplitCurve2dContinuity.cxx | 2 +- .../ShapeUpgrade_SplitCurve3d.cxx | 4 +- .../ShapeUpgrade_SplitCurve3dContinuity.cxx | 2 +- .../ShapeUpgrade_SplitSurface.cxx | 6 +- .../ShapeUpgrade_SplitSurfaceContinuity.cxx | 2 +- .../ShapeUpgrade_UnifySameDomain.cxx | 4 +- src/ShapeUpgrade/ShapeUpgrade_WireDivide.cxx | 2 +- src/StdPrs/StdPrs_ShadedShape.cxx | 2 +- src/TopTrans/TopTrans_SurfaceTransition.cxx | 6 +- src/ViewerTest/ViewerTest_ObjectCommands.cxx | 2 +- src/VrmlData/VrmlData_Material.cxx | 4 +- src/VrmlData/VrmlData_ShapeConvert.cxx | 2 +- src/gce/gce_MakeCirc.cxx | 2 +- 171 files changed, 368 insertions(+), 364 deletions(-) diff --git a/src/AIS/AIS_ColorScale.cxx b/src/AIS/AIS_ColorScale.cxx index 08ec0bcf75..704245425d 100644 --- a/src/AIS/AIS_ColorScale.cxx +++ b/src/AIS/AIS_ColorScale.cxx @@ -293,7 +293,7 @@ Aspect_SequenceOfColor AIS_ColorScale::MakeUniformColors (Standard_Integer theNb // adjust range to be within (0, 360], with sign according to theHueFrom and theHueTo Standard_Real aHueRange = std::fmod (theHueTo - theHueFrom, 360.); - const Standard_Real aHueEps = Precision::Angular() * 180. / M_PI; + constexpr Standard_Real aHueEps = Precision::Angular() * 180. / M_PI; if (Abs (aHueRange) <= aHueEps) { aHueRange = (aHueRange < 0 ? -360. : 360.); diff --git a/src/Adaptor3d/Adaptor3d_CurveOnSurface.cxx b/src/Adaptor3d/Adaptor3d_CurveOnSurface.cxx index 1f6c58642a..c6bc29ed34 100644 --- a/src/Adaptor3d/Adaptor3d_CurveOnSurface.cxx +++ b/src/Adaptor3d/Adaptor3d_CurveOnSurface.cxx @@ -147,7 +147,7 @@ static void Hunt(const TColStd_Array1OfReal& Arr, Standard_Integer& Iloc) {//Warning: Hunt is used to find number of knot which equals coordinate component, // when coordinate component definitely equals a knot only. - Standard_Real Tol=Precision::PConfusion()/10; + constexpr Standard_Real Tol=Precision::PConfusion()/10; Standard_Integer i=1; while((i <= Arr.Upper()) && (Abs(Coord - Arr(i)) > Tol)){ i++;} @@ -204,7 +204,7 @@ static void FindBounds(const TColStd_Array1OfReal& Arr, { Standard_Integer N=0; - Standard_Real Tol=Precision::PConfusion()/10; + constexpr Standard_Real Tol=Precision::PConfusion()/10; Hunt(Arr,Coord,N); DerNull=Standard_False; @@ -243,7 +243,7 @@ static void Locate1Coord(const Standard_Integer Index, gp_Pnt2d& LeftBot, gp_Pnt2d& RightTop) { Standard_Real Comp1=0, DComp1=0, cur, f = 0.0, l = 0.0; - Standard_Real Tol = Precision::PConfusion()/10; + constexpr Standard_Real Tol = Precision::PConfusion()/10; Standard_Integer i = 1, Bnd1, Bnd2; Standard_Boolean DIsNull= Standard_False; TColStd_Array1OfReal Arr(1,BSplC->NbKnots()); BSplC->Knots(Arr); @@ -345,7 +345,7 @@ static void Locate1Coord(const Standard_Integer Index, gp_Pnt2d& RightTop) { Standard_Real Comp1=0,DComp1=0; - Standard_Real Tol = Precision::PConfusion()/10; + constexpr Standard_Real Tol = Precision::PConfusion()/10; Standard_Integer i=1, Up=0, Up1, Up2, Down=0, Down1, Down2; Standard_Real cur = 0.; @@ -556,7 +556,7 @@ static void Locate2Coord(const Standard_Integer Index, const Standard_Real I2, gp_Pnt2d& LeftBot, gp_Pnt2d& RightTop) { - Standard_Real Tol=Precision::PConfusion()/10; + constexpr Standard_Real Tol=Precision::PConfusion()/10; Standard_Real Comp1=0,DComp1=0; if(Index==1) { Comp1=UV.X(); DComp1=DUV.X();} @@ -620,7 +620,7 @@ static void Locate2Coord(const Standard_Integer Index, gp_Pnt2d& LeftBot, gp_Pnt2d& RightTop) { Standard_Real Comp=0,DComp=0,Tmp1=0.0,Tmp2=0.0; - Standard_Real Tol=Precision::PConfusion()/10; + constexpr Standard_Real Tol=Precision::PConfusion()/10; Standard_Integer N=0, NUp=0, NLo=0; if(Index==1) { Comp=UV.X(); @@ -893,7 +893,7 @@ Standard_Integer Adaptor3d_CurveOnSurface::NbIntervals (const GeomAbs_Shape S) c myCurve->Intervals(TabC,S); - Standard_Real Tol= Precision::PConfusion()/10; + constexpr Standard_Real Tol= Precision::PConfusion()/10; // sorted sequence of parameters defining continuity intervals; // started with own intervals of curve and completed by @@ -1063,7 +1063,7 @@ void Adaptor3d_CurveOnSurface::D1(const Standard_Real U , Standard_Real FP = myCurve->FirstParameter(); Standard_Real LP = myCurve->LastParameter(); - Standard_Real Tol= Precision::PConfusion()/10; + constexpr Standard_Real Tol= Precision::PConfusion()/10; if( ( Abs(U-FP)D1(U,Puv,Duv); @@ -1103,7 +1103,7 @@ void Adaptor3d_CurveOnSurface::D2(const Standard_Real U, Standard_Real FP = myCurve->FirstParameter(); Standard_Real LP = myCurve->LastParameter(); - Standard_Real Tol= Precision::PConfusion()/10; + constexpr Standard_Real Tol= Precision::PConfusion()/10; if( (Abs(U-FP)D2(U,UV,DW,D2W); @@ -1152,7 +1152,7 @@ void Adaptor3d_CurveOnSurface::D3 gp_Vec& V3) const { - Standard_Real Tol= Precision::PConfusion()/10; + constexpr Standard_Real Tol= Precision::PConfusion()/10; gp_Pnt2d UV; gp_Vec2d DW,D2W,D3W; gp_Vec D1U,D1V,D2U,D2V,D2UV,D3U,D3V,D3UUV,D3UVV; @@ -1651,7 +1651,7 @@ void Adaptor3d_CurveOnSurface::EvalFirstLastSurf() Standard_Real FirstPar,LastPar; gp_Pnt2d UV, LeftBot, RightTop; gp_Vec2d DUV; - Standard_Real Tol= Precision::PConfusion()/10; + constexpr Standard_Real Tol= Precision::PConfusion()/10; Standard_Boolean Ok = Standard_True; diff --git a/src/AdvApprox/AdvApprox_DichoCutting.cxx b/src/AdvApprox/AdvApprox_DichoCutting.cxx index 369c43edc8..f0f83888b7 100644 --- a/src/AdvApprox/AdvApprox_DichoCutting.cxx +++ b/src/AdvApprox/AdvApprox_DichoCutting.cxx @@ -27,7 +27,7 @@ Standard_Boolean AdvApprox_DichoCutting::Value(const Standard_Real a, Standard_Real& cuttingvalue) const { // longueur minimum d'un intervalle pour F(U,V) : EPS1=1.e-9 (cf.MEPS1) - Standard_Real lgmin = 10*Precision::PConfusion(); + constexpr Standard_Real lgmin = 10*Precision::PConfusion(); cuttingvalue = (a+b) / 2; return (Abs(b-a)>=2*lgmin); } diff --git a/src/AdvApprox/AdvApprox_PrefAndRec.cxx b/src/AdvApprox/AdvApprox_PrefAndRec.cxx index be5e8ba9c2..8596abbbec 100644 --- a/src/AdvApprox/AdvApprox_PrefAndRec.cxx +++ b/src/AdvApprox/AdvApprox_PrefAndRec.cxx @@ -36,7 +36,7 @@ Standard_Boolean AdvApprox_PrefAndRec::Value(const Standard_Real a, Standard_Real& cuttingvalue) const { // longueur minimum d'un intervalle parametrique : 10*PConfusion() - Standard_Real lgmin = 10 * Precision::PConfusion(); + constexpr Standard_Real lgmin = 10 * Precision::PConfusion(); Standard_Integer i; Standard_Real cut, mil=(a+b)/2, dist; Standard_Boolean isfound = Standard_False; diff --git a/src/AdvApprox/AdvApprox_PrefCutting.cxx b/src/AdvApprox/AdvApprox_PrefCutting.cxx index 02753ec1f7..d2509c7ecb 100644 --- a/src/AdvApprox/AdvApprox_PrefCutting.cxx +++ b/src/AdvApprox/AdvApprox_PrefCutting.cxx @@ -30,7 +30,7 @@ Standard_Boolean AdvApprox_PrefCutting::Value(const Standard_Real a, { // longueur minimum d'un intervalle parametrique : PConfusion() // pour F(U,V) : EPS1=1.e-9 (cf.MMEPS1) - Standard_Real lgmin = 10 * Precision::PConfusion(); + constexpr Standard_Real lgmin = 10 * Precision::PConfusion(); Standard_Integer i; Standard_Real cut, mil=(a+b)/2, dist = Abs((a-b)/2); diff --git a/src/AppDef/AppDef_Variational.cxx b/src/AppDef/AppDef_Variational.cxx index b4604d0e35..c1618c6850 100644 --- a/src/AppDef/AppDef_Variational.cxx +++ b/src/AppDef/AppDef_Variational.cxx @@ -2004,7 +2004,7 @@ void AppDef_Variational::InitSmoothCriterion() void AppDef_Variational::InitParameters(Standard_Real& Length) { - const Standard_Real Eps1 = Precision::Confusion() * .01; + constexpr Standard_Real Eps1 = Precision::Confusion() * .01; Standard_Real aux, dist; Standard_Integer i, i0, i1 = 0, ipoint; @@ -2052,7 +2052,7 @@ void AppDef_Variational::InitCriterionEstimations(const Standard_Real Length, { E1 = Length * Length; - const Standard_Real Eps1 = Precision::Confusion() * .01; + constexpr Standard_Real Eps1 = Precision::Confusion() * .01; math_Vector VTang1(1, myDimension), VTang2(1, myDimension), VTang3(1, myDimension), VScnd1(1, myDimension), VScnd2(1, myDimension), VScnd3(1, myDimension); @@ -2180,7 +2180,7 @@ void AppDef_Variational::EstTangent(const Standard_Integer ipnt, { Standard_Integer i ; - const Standard_Real Eps1 = Precision::Confusion() * .01; + constexpr Standard_Real Eps1 = Precision::Confusion() * .01; const Standard_Real EpsNorm = 1.e-9; Standard_Real Wpnt = 1.; diff --git a/src/Approx/Approx_ComputeLine.gxx b/src/Approx/Approx_ComputeLine.gxx index 9e63eb95a9..938ba47033 100644 --- a/src/Approx/Approx_ComputeLine.gxx +++ b/src/Approx/Approx_ComputeLine.gxx @@ -139,7 +139,7 @@ static Standard_Boolean CheckMultiCurve(const AppParCurves_MultiCurve& theMultiC return Standard_True; const Standard_Real MinScalProd = -0.9; - const Standard_Real SqTol3d = Precision::SquareConfusion(); + constexpr Standard_Real SqTol3d = Precision::SquareConfusion(); theIndbad = 0; Standard_Integer indbads [4]; diff --git a/src/ApproxInt/ApproxInt_ImpPrmSvSurfaces.gxx b/src/ApproxInt/ApproxInt_ImpPrmSvSurfaces.gxx index 2aa215b58c..6c992b7079 100644 --- a/src/ApproxInt/ApproxInt_ImpPrmSvSurfaces.gxx +++ b/src/ApproxInt/ApproxInt_ImpPrmSvSurfaces.gxx @@ -438,7 +438,7 @@ Standard_Boolean ApproxInt_ImpPrmSvSurfaces::Compute( Standard_Real& u1, gp_Vec2d& aPrmTg = MyImplicitFirst ? Tguv2 : Tguv1; //for square - const Standard_Real aNullValue = Precision::Approximation()* + constexpr Standard_Real aNullValue = Precision::Approximation()* Precision::Approximation(), anAngTol = Precision::Angular(); diff --git a/src/ApproxInt/ApproxInt_MultiLine.gxx b/src/ApproxInt/ApproxInt_MultiLine.gxx index 45225b1364..d5e4845972 100644 --- a/src/ApproxInt/ApproxInt_MultiLine.gxx +++ b/src/ApproxInt/ApproxInt_MultiLine.gxx @@ -621,7 +621,7 @@ Standard_Boolean ((TheSvSurfaces *)PtrOnmySvSurfaces)->SetUseSolver(Standard_True); } - const Standard_Real SqTol3d = Precision::SquareConfusion(); + constexpr Standard_Real SqTol3d = Precision::SquareConfusion(); math_Vector tolerance(1,2); tolerance(1) = tolerance(2) = 1.e-8; diff --git a/src/BOPTools/BOPTools_AlgoTools.cxx b/src/BOPTools/BOPTools_AlgoTools.cxx index 7b60afb821..131170d72c 100644 --- a/src/BOPTools/BOPTools_AlgoTools.cxx +++ b/src/BOPTools/BOPTools_AlgoTools.cxx @@ -989,7 +989,7 @@ Standard_Boolean BOPTools_AlgoTools::GetFaceOff // // The difference between faces should be obvious enough // to guarantee the correctness of the classification - Standard_Real anAngleCriteria = Precision::Confusion(); + constexpr Standard_Real anAngleCriteria = Precision::Confusion(); bRet=Standard_True; aIt.Initialize(theLCSOff); @@ -2181,7 +2181,7 @@ Standard_Real MinStep3D(const TopoDS_Edge& theE1, } // if (aR > 100.) { - Standard_Real d = 10*Precision::PConfusion(); + constexpr Standard_Real d = 10*Precision::PConfusion(); aDtMin = Max(aDtMin, sqrt(d*d + 2*d*aR)); } } diff --git a/src/BOPTools/BOPTools_AlgoTools2D.cxx b/src/BOPTools/BOPTools_AlgoTools2D.cxx index 9bcafe1c33..9c3b943131 100644 --- a/src/BOPTools/BOPTools_AlgoTools2D.cxx +++ b/src/BOPTools/BOPTools_AlgoTools2D.cxx @@ -698,7 +698,7 @@ void BOPTools_AlgoTools2D::IsEdgeIsoline( const TopoDS_Edge& theE, aT /= sqrt(aSqMagn); //sin(da) ~ da, when da->0. - const Standard_Real aTol = Precision::Angular(); + constexpr Standard_Real aTol = Precision::Angular(); const gp_Vec2d aRefVDir(0.0, 1.0), aRefUDir(1.0, 0.0); const Standard_Real aDPv = aT.CrossMagnitude(aRefVDir), diff --git a/src/BRep/BRep_Tool.cxx b/src/BRep/BRep_Tool.cxx index 57b95f7ef0..ac4dd151cb 100644 --- a/src/BRep/BRep_Tool.cxx +++ b/src/BRep/BRep_Tool.cxx @@ -138,7 +138,7 @@ Standard_Real BRep_Tool::Tolerance(const TopoDS_Face& F) { const BRep_TFace* TF = static_cast(F.TShape().get()); Standard_Real p = TF->Tolerance(); - Standard_Real pMin = Precision::Confusion(); + constexpr Standard_Real pMin = Precision::Confusion(); if (p > pMin) return p; else return pMin; } @@ -812,7 +812,7 @@ Standard_Real BRep_Tool::Tolerance(const TopoDS_Edge& E) { const BRep_TEdge* TE = static_cast(E.TShape().get()); Standard_Real p = TE->Tolerance(); - Standard_Real pMin = Precision::Confusion(); + constexpr Standard_Real pMin = Precision::Confusion(); if (p > pMin) return p; else return pMin; } @@ -1258,7 +1258,7 @@ Standard_Real BRep_Tool::Tolerance(const TopoDS_Vertex& V) } Standard_Real p = aTVert->Tolerance(); - Standard_Real pMin = Precision::Confusion(); + constexpr Standard_Real pMin = Precision::Confusion(); if (p > pMin) return p; else return pMin; } diff --git a/src/BRepBndLib/BRepBndLib_1.cxx b/src/BRepBndLib/BRepBndLib_1.cxx index f77feec382..3c0b332dcf 100644 --- a/src/BRepBndLib/BRepBndLib_1.cxx +++ b/src/BRepBndLib/BRepBndLib_1.cxx @@ -256,7 +256,7 @@ static Standard_Integer PointsForOBB(const TopoDS_Shape& theS, //======================================================================= static Standard_Integer IsWCS(const gp_Dir& theDir) { - const Standard_Real aToler = Precision::Angular()*Precision::Angular(); + constexpr Standard_Real aToler = Precision::Angular()*Precision::Angular(); const Standard_Real aX = theDir.X(), aY = theDir.Y(), diff --git a/src/BRepCheck/BRepCheck_Edge.cxx b/src/BRepCheck/BRepCheck_Edge.cxx index 32d55b8cd7..2f3fb93fe0 100644 --- a/src/BRepCheck/BRepCheck_Edge.cxx +++ b/src/BRepCheck/BRepCheck_Edge.cxx @@ -140,7 +140,7 @@ void BRepCheck_Edge::Minimum() if (!myCref.IsNull()) { Handle(BRep_GCurve) GCref (Handle(BRep_GCurve)::DownCast (myCref)); - Standard_Real eps = Precision::PConfusion(); + constexpr Standard_Real eps = Precision::PConfusion(); Standard_Real First,Last; GCref->Range(First,Last); if (Last<=First) { @@ -314,7 +314,7 @@ void BRepCheck_Edge::InContext(const TopoDS_Shape& S) Standard_Boolean pcurvefound = Standard_False; BRep_ListIteratorOfListOfCurveRepresentation itcr(TE->Curves()); - Standard_Real eps = Precision::PConfusion(); + constexpr Standard_Real eps = Precision::PConfusion(); Standard_Boolean toRunParallel = !myMutex.IsNull(); while (itcr.More()) { const Handle(BRep_CurveRepresentation)& cr = itcr.Value(); diff --git a/src/BRepClass/BRepClass_FaceExplorer.cxx b/src/BRepClass/BRepClass_FaceExplorer.cxx index a0f12833fa..23335b3be5 100644 --- a/src/BRepClass/BRepClass_FaceExplorer.cxx +++ b/src/BRepClass/BRepClass_FaceExplorer.cxx @@ -147,7 +147,7 @@ Standard_Boolean BRepClass_FaceExplorer::OtherSegment(const gp_Pnt2d& P, Standard_Real aFPar; Standard_Real aLPar; Handle(Geom2d_Curve) aC2d; - Standard_Real aTolParConf2 = Precision::PConfusion() * Precision::PConfusion(); + constexpr Standard_Real aTolParConf2 = Precision::PConfusion() * Precision::PConfusion(); gp_Pnt2d aPOnC; Standard_Real aParamIn; diff --git a/src/BRepClass3d/BRepClass3d_SolidExplorer.cxx b/src/BRepClass3d/BRepClass3d_SolidExplorer.cxx index 43b657b336..56849fe261 100644 --- a/src/BRepClass3d/BRepClass3d_SolidExplorer.cxx +++ b/src/BRepClass3d/BRepClass3d_SolidExplorer.cxx @@ -441,7 +441,7 @@ Standard_Integer BRepClass3d_SolidExplorer::OtherSegment(const gp_Pnt& P, gp_Lin& L, Standard_Real& _Par) { - const Standard_Real TolU = Precision::PConfusion(); + constexpr Standard_Real TolU = Precision::PConfusion(); const Standard_Real TolV = TolU; TopoDS_Face face; @@ -500,7 +500,7 @@ Standard_Integer BRepClass3d_SolidExplorer::OtherSegment(const gp_Pnt& P, face.Orientation(TopAbs_FORWARD); // //avoid process faces from uncorrected shells - const Standard_Real eps = Precision::PConfusion(); + constexpr Standard_Real eps = Precision::PConfusion(); Standard_Real epsU = Max(eps * Max(Abs(U2), Abs(U1)), eps); Standard_Real epsV = Max(eps * Max(Abs(V2), Abs(V1)), eps); if( Abs (U2 - U1) < epsU || Abs(V2 - V1) < epsV) { diff --git a/src/BRepExtrema/BRepExtrema_DistanceSS.cxx b/src/BRepExtrema/BRepExtrema_DistanceSS.cxx index c287d05ba3..6ecec5c623 100644 --- a/src/BRepExtrema/BRepExtrema_DistanceSS.cxx +++ b/src/BRepExtrema/BRepExtrema_DistanceSS.cxx @@ -423,7 +423,7 @@ static void PERFORM_C0(const TopoDS_Edge& S1, const TopoDS_Edge& S2, if (pCurv->Continuity() == GeomAbs_C0) { - const Standard_Real epsP = Precision::PConfusion(); + constexpr Standard_Real epsP = Precision::PConfusion(); GeomAdaptor_Curve aAdaptorCurve(pCurv, aFirst, aLast); const Standard_Integer nbIntervals = aAdaptorCurve.NbIntervals(GeomAbs_C1); @@ -716,7 +716,7 @@ void BRepExtrema_DistanceSS::Perform (const TopoDS_Vertex& theS1, if ((Dstmin < myDstRef - myEps) || (fabs(Dstmin - myDstRef) < myEps)) { gp_Pnt Pt, P1 = BRep_Tool::Pnt(theS1); - const Standard_Real epsP = Precision::PConfusion(); + constexpr Standard_Real epsP = Precision::PConfusion(); for (i = 1; i <= NbExtrema; i++) { @@ -833,7 +833,7 @@ void BRepExtrema_DistanceSS::Perform (const TopoDS_Edge& theS1, if ((Dstmin < myDstRef - myEps) || (fabs(Dstmin - myDstRef) < myEps)) { gp_Pnt Pt1, Pt2; - const Standard_Real epsP = Precision::PConfusion(); + constexpr Standard_Real epsP = Precision::PConfusion(); for (i = 1; i <= NbExtrema; i++) { @@ -925,7 +925,7 @@ void BRepExtrema_DistanceSS::Perform (const TopoDS_Edge& theS1, const TopoDS_Fac const Standard_Real tol = BRep_Tool::Tolerance(theS2); gp_Pnt Pt1, Pt2; - const Standard_Real epsP = Precision::PConfusion(); + constexpr Standard_Real epsP = Precision::PConfusion(); for (i = 1; i <= NbExtrema; i++) { diff --git a/src/BRepExtrema/BRepExtrema_ProximityValueTool.cxx b/src/BRepExtrema/BRepExtrema_ProximityValueTool.cxx index 3bb0f0d4bb..3190cb90db 100644 --- a/src/BRepExtrema/BRepExtrema_ProximityValueTool.cxx +++ b/src/BRepExtrema/BRepExtrema_ProximityValueTool.cxx @@ -400,7 +400,7 @@ Standard_Boolean BRepExtrema_ProximityValueTool::getFaceAdditionalVertices ( BVH_Array3d& theAddVertices, NCollection_Vector& theAddStatuses) { - Standard_Real aTol = Precision::Confusion(); + constexpr Standard_Real aTol = Precision::Confusion(); TopLoc_Location aLocation; Handle(Poly_Triangulation) aTr = BRep_Tool::Triangulation (theFace, aLocation); diff --git a/src/BRepFeat/BRepFeat.cxx b/src/BRepFeat/BRepFeat.cxx index 010de828ac..2f28c4d6a6 100644 --- a/src/BRepFeat/BRepFeat.cxx +++ b/src/BRepFeat/BRepFeat.cxx @@ -314,7 +314,7 @@ void BRepFeat::ParametricMinMax(const TopoDS_Shape& S, static Standard_Boolean IsIn (BRepTopAdaptor_FClass2d& FC, const Geom2dAdaptor_Curve& AC) { - Standard_Real Def = 100*Precision::Confusion(); + constexpr Standard_Real Def = 100*Precision::Confusion(); GCPnts_QuasiUniformDeflection QU(AC,Def); for (Standard_Integer i = 1; i <= QU.NbPoints(); i++) { diff --git a/src/BRepFeat/BRepFeat_Form.cxx b/src/BRepFeat/BRepFeat_Form.cxx index 4ea9ea05a5..225fb71175 100644 --- a/src/BRepFeat/BRepFeat_Form.cxx +++ b/src/BRepFeat/BRepFeat_Form.cxx @@ -755,7 +755,7 @@ static void Descendants(const TopoDS_Shape&, // intersects Shapes From and Until // case of several intersections (keep PartsOfTool according to the selection) // position of the face of intersection in PartsOfTool (before or after) - Standard_Real delta = Precision::Confusion(); + constexpr Standard_Real delta = Precision::Confusion(); if (myPerfSelection != BRepFeat_NoSelection) { // modif of the test for cts21181 : (prbmax2 and prnmin2) -> (prbmin1 and prbmax1) diff --git a/src/BRepFeat/BRepFeat_MakePrism.cxx b/src/BRepFeat/BRepFeat_MakePrism.cxx index 27eade49fd..68ccf8c7cf 100644 --- a/src/BRepFeat/BRepFeat_MakePrism.cxx +++ b/src/BRepFeat/BRepFeat_MakePrism.cxx @@ -1078,8 +1078,8 @@ static Standard_Boolean ToFuse (const TopoDS_Face& F1, const TopoDS_Face& F2) Handle(Geom_Surface) S1,S2; TopLoc_Location loc1, loc2; Handle(Standard_Type) typS1,typS2; - const Standard_Real tollin = Precision::Confusion(); - const Standard_Real tolang = Precision::Angular(); + constexpr Standard_Real tollin = Precision::Confusion(); + constexpr Standard_Real tolang = Precision::Angular(); S1 = BRep_Tool::Surface(F1,loc1); S2 = BRep_Tool::Surface(F2,loc2); diff --git a/src/BRepFeat/BRepFeat_MakeRevol.cxx b/src/BRepFeat/BRepFeat_MakeRevol.cxx index df0c980513..f441bb4e95 100644 --- a/src/BRepFeat/BRepFeat_MakeRevol.cxx +++ b/src/BRepFeat/BRepFeat_MakeRevol.cxx @@ -834,8 +834,8 @@ Standard_Boolean ToFuse(const TopoDS_Face& F1, Handle(Geom_Surface) S1,S2; TopLoc_Location loc1, loc2; Handle(Standard_Type) typS1,typS2; - const Standard_Real tollin = Precision::Confusion(); - const Standard_Real tolang = Precision::Angular(); + constexpr Standard_Real tollin = Precision::Confusion(); + constexpr Standard_Real tolang = Precision::Angular(); S1 = BRep_Tool::Surface(F1,loc1); S2 = BRep_Tool::Surface(F2,loc2); diff --git a/src/BRepFill/BRepFill_Evolved.cxx b/src/BRepFill/BRepFill_Evolved.cxx index 373c257160..a019dec635 100644 --- a/src/BRepFill/BRepFill_Evolved.cxx +++ b/src/BRepFill/BRepFill_Evolved.cxx @@ -3071,7 +3071,7 @@ void CutEdgeProf (const TopoDS_Edge& E, // On calcule les intersection avec Oy. Geom2dAdaptor_Curve ALine(Line); - Standard_Real Tol = Precision::Intersection(); + constexpr Standard_Real Tol = Precision::Intersection(); Standard_Real TolC = 0.; Geom2dInt_GInter Intersector(ALine,AC2d,TolC,Tol); diff --git a/src/BRepFill/BRepFill_Generator.cxx b/src/BRepFill/BRepFill_Generator.cxx index 553a0365a0..b4d48bb3d4 100644 --- a/src/BRepFill/BRepFill_Generator.cxx +++ b/src/BRepFill/BRepFill_Generator.cxx @@ -907,7 +907,7 @@ void BRepFill_Generator::Perform() } // set the pcurves - Standard_Real T = Precision::Confusion(); + constexpr Standard_Real T = Precision::Confusion(); if (IType != 4) //not plane { diff --git a/src/BRepFill/BRepFill_MultiLine.cxx b/src/BRepFill/BRepFill_MultiLine.cxx index 4b4714dad8..74225f42e6 100644 --- a/src/BRepFill/BRepFill_MultiLine.cxx +++ b/src/BRepFill/BRepFill_MultiLine.cxx @@ -109,8 +109,8 @@ BRepFill_MultiLine::BRepFill_MultiLine(const TopoDS_Face& Face1, myKPart(0) { // - const Standard_Real mult = 5.; - const Standard_Real eps = mult * Precision::Confusion(); + constexpr Standard_Real mult = 5.; + constexpr Standard_Real eps = mult * Precision::Confusion(); // myNbPnt2d = 2; myNbPnt = 1; @@ -585,8 +585,8 @@ static gp_Pnt2d ValueOnFace(const Standard_Real U, } #endif // - const Standard_Real mult = 5.; - const Standard_Real eps = mult * Precision::Confusion(); + constexpr Standard_Real mult = 5.; + constexpr Standard_Real eps = mult * Precision::Confusion(); // Standard_Real UU =0., Dist = Precision::Infinite(), D1, D2; @@ -627,7 +627,7 @@ static gp_Pnt2d ValueOnFace(const Standard_Real U, } } - const Standard_Real Tol = Precision::Confusion(); + constexpr Standard_Real Tol = Precision::Confusion(); Standard_Real VV; gp_Pnt2d PF = TheV.Value(TheV.FirstParameter()); diff --git a/src/BRepFill/BRepFill_NSections.cxx b/src/BRepFill/BRepFill_NSections.cxx index 6e7f0c984b..3c9550c7f7 100644 --- a/src/BRepFill/BRepFill_NSections.cxx +++ b/src/BRepFill/BRepFill_NSections.cxx @@ -516,7 +516,7 @@ void BRepFill_NSections::Init(const TColStd_SequenceOfReal & P, myLaws = new (GeomFill_HArray1OfSectionLaw) (1, NbEdge); - Standard_Real tol = Precision::Confusion(); + constexpr Standard_Real tol = Precision::Confusion(); mySurface = totalsurf(myEdges->Array2(),myShapes.Length(),NbEdge, myParams,w1Point,w2Point,uclosed,vclosed,tol); diff --git a/src/BRepFill/BRepFill_OffsetWire.cxx b/src/BRepFill/BRepFill_OffsetWire.cxx index dae07a5bb3..a0ec2ad56f 100644 --- a/src/BRepFill/BRepFill_OffsetWire.cxx +++ b/src/BRepFill/BRepFill_OffsetWire.cxx @@ -1913,8 +1913,8 @@ void CutCurve (const Handle(Geom2d_TrimmedCurve)& C, Standard_Real UF,UL,UC; Standard_Real Step; gp_Pnt2d PF,PL,PC; - Standard_Real PTol = Precision::PConfusion()*10; - Standard_Real Tol = Precision::Confusion()*10; + constexpr Standard_Real PTol = Precision::PConfusion()*10; + constexpr Standard_Real Tol = Precision::Confusion()*10; Standard_Boolean YaCut = Standard_False; UF = C->FirstParameter(); @@ -2141,7 +2141,7 @@ Standard_Boolean VertexFromNode (const Handle(MAT_Node)& aNode, TopoDS_Vertex& VN) { Standard_Boolean Status; - Standard_Real Tol = Precision::Confusion(); + constexpr Standard_Real Tol = Precision::Confusion(); BRep_Builder B; if (!aNode->Infinite() && Abs(aNode->Distance()-Offset) < Tol) { @@ -2243,7 +2243,7 @@ void TrimEdge (const TopoDS_Edge& E, // otherwise preserve only one of its representations. //---------------------------------------------------------- if (!BRep_Tool::Degenerated(E)) { - Standard_Real aParTol = 2.0 * Precision::PConfusion(); + constexpr Standard_Real aParTol = 2.0 * Precision::PConfusion(); for (Standard_Integer k = 1; k < TheVer.Length(); k ++) { if (TheVer.Value(k).IsSame(TheVer.Value(k+1)) || Abs(ThePar.Value(k)-ThePar.Value(k+1)) <= aParTol) { @@ -2487,7 +2487,7 @@ static void CheckBadEdges(const TopoDS_Face& Spine, const Standard_Real Offset, { TopoDS_Face F = TopoDS::Face(Spine.Oriented(TopAbs_FORWARD)); - Standard_Real eps = Precision::Confusion(); + constexpr Standard_Real eps = Precision::Confusion(); Standard_Real LimCurv = 1./Offset; TopTools_MapOfShape aMap; diff --git a/src/BRepFill/BRepFill_SectionPlacement.cxx b/src/BRepFill/BRepFill_SectionPlacement.cxx index 631d94183d..de03bf6931 100644 --- a/src/BRepFill/BRepFill_SectionPlacement.cxx +++ b/src/BRepFill/BRepFill_SectionPlacement.cxx @@ -125,7 +125,8 @@ BRepFill_SectionPlacement(const Handle(BRepFill_LocationLaw)& Law, Ex.Next(); if( Ex.More() ) { - Standard_Real tolrac, epsV, tol = Precision::Confusion(); + Standard_Real tolrac, epsV; + constexpr Standard_Real tol = Precision::Confusion(); GeomConvert_CompCurveToBSplineCurve Conv(TC); for (; Ex.More(); Ex.Next()) { E = TopoDS::Edge(Ex.Current()); @@ -289,8 +290,8 @@ BRepFill_SectionPlacement(const Handle(BRepFill_LocationLaw)& Law, Place.Perform(adpPath, Precision::Confusion()); - Standard_Real theParam = Place.ParameterOnPath(), - eps = Precision::PConfusion(); + Standard_Real theParam = Place.ParameterOnPath(); + constexpr Standard_Real eps = Precision::PConfusion(); #ifdef OCCT_DEBUG if (myDebug) { diff --git a/src/BRepFill/BRepFill_TrimEdgeTool.cxx b/src/BRepFill/BRepFill_TrimEdgeTool.cxx index 0cd9a0949d..32084d1f92 100644 --- a/src/BRepFill/BRepFill_TrimEdgeTool.cxx +++ b/src/BRepFill/BRepFill_TrimEdgeTool.cxx @@ -177,7 +177,7 @@ static void EvalParameters(const Geom2dAdaptor_Curve& Bis, TColgp_SequenceOfPnt& Params) { Geom2dInt_GInter Intersector; - Standard_Real Tol = Precision::Confusion(); + constexpr Standard_Real Tol = Precision::Confusion(); // Standard_Real TolC = 1.e-9; const Geom2dAdaptor_Curve& CBis(Bis); @@ -519,7 +519,7 @@ void BRepFill_TrimEdgeTool::IntersectWith(const TopoDS_Edge& Edge1, // The tolerance can be eventually changed. gp_Pnt P1,P2; - Standard_Real Tol = 4 * 100 * Precision::PConfusion(); + constexpr Standard_Real Tol = 4 * 100 * Precision::PConfusion(); Standard_Integer i = 1; Standard_Integer NbPoints = Params.Length(); @@ -660,7 +660,7 @@ void BRepFill_TrimEdgeTool::AddOrConfuse(const Standard_Boolean Start, { Standard_Boolean ToProj = Standard_True; gp_Pnt2d PBis; - Standard_Real Tol = 10*Precision::Confusion(); + constexpr Standard_Real Tol = 10*Precision::Confusion(); // return curves associated to edges. TopLoc_Location L; diff --git a/src/BRepGProp/BRepGProp_Face.cxx b/src/BRepGProp/BRepGProp_Face.cxx index 38892ac8a5..29d0f4e6e7 100644 --- a/src/BRepGProp/BRepGProp_Face.cxx +++ b/src/BRepGProp/BRepGProp_Face.cxx @@ -548,7 +548,7 @@ static void GetRealKnots(const Standard_Real theMin, Standard_Integer iU = theKnots->Upper(); Standard_Integer aStartI = 0; Standard_Integer aEndI = 0; - Standard_Real aTol = Precision::Confusion(); + constexpr Standard_Real aTol = Precision::Confusion(); while (++i < iU) { if (aStartI == 0 && theKnots->Value(i) > theMin + aTol) diff --git a/src/BRepLib/BRepLib.cxx b/src/BRepLib/BRepLib.cxx index e5f5e002cb..6dd1c895d7 100644 --- a/src/BRepLib/BRepLib.cxx +++ b/src/BRepLib/BRepLib.cxx @@ -2940,7 +2940,7 @@ void BRepLib::ExtendFace(const TopoDS_Face& theF, // Check if the periodic surface should become closed. // In this case, use the basis surface with basis bounds. - const Standard_Real anEps = Precision::PConfusion(); + constexpr Standard_Real anEps = Precision::PConfusion(); if (isUPeriodic && Abs(aFUMax - aFUMin - anUPeriod) < anEps) { aFUMin = aSUMin; diff --git a/src/BRepLib/BRepLib_FuseEdges.cxx b/src/BRepLib/BRepLib_FuseEdges.cxx index 537c9c3181..1999932236 100644 --- a/src/BRepLib/BRepLib_FuseEdges.cxx +++ b/src/BRepLib/BRepLib_FuseEdges.cxx @@ -778,8 +778,8 @@ Standard_Boolean BRepLib_FuseEdges::SameSupport(const TopoDS_Edge& E1, } // On a presomption de confusion - const Standard_Real tollin = Precision::Confusion(); - const Standard_Real tolang = Precision::Angular(); + constexpr Standard_Real tollin = Precision::Confusion(); + constexpr Standard_Real tolang = Precision::Angular(); if (typC1 == STANDARD_TYPE(Geom_Line)) { gp_Lin li1( Handle(Geom_Line)::DownCast (C1)->Lin()); gp_Lin li2( Handle(Geom_Line)::DownCast (C2)->Lin()); diff --git a/src/BRepLib/BRepLib_MakeEdge.cxx b/src/BRepLib/BRepLib_MakeEdge.cxx index f1ddbdcefb..0ef4d82d4d 100644 --- a/src/BRepLib/BRepLib_MakeEdge.cxx +++ b/src/BRepLib/BRepLib_MakeEdge.cxx @@ -781,7 +781,7 @@ void BRepLib_MakeEdge::Init(const Handle(Geom_Curve)& CC, Standard_Real p2 = pp2; Standard_Real cf = C->FirstParameter(); Standard_Real cl = C->LastParameter(); - Standard_Real epsilon = Precision::PConfusion(); + constexpr Standard_Real epsilon = Precision::PConfusion(); Standard_Boolean periodic = C->IsPeriodic(); GeomAdaptor_Curve aCA(C); @@ -1058,7 +1058,7 @@ void BRepLib_MakeEdge::Init(const Handle(Geom2d_Curve)& CC, Standard_Real p2 = pp2; Standard_Real cf = C->FirstParameter(); Standard_Real cl = C->LastParameter(); - Standard_Real epsilon = Precision::PConfusion(); + constexpr Standard_Real epsilon = Precision::PConfusion(); Standard_Boolean periodic = C->IsPeriodic(); diff --git a/src/BRepLib/BRepLib_MakeEdge2d.cxx b/src/BRepLib/BRepLib_MakeEdge2d.cxx index f04af3e5a8..9cfafe3a2c 100644 --- a/src/BRepLib/BRepLib_MakeEdge2d.cxx +++ b/src/BRepLib/BRepLib_MakeEdge2d.cxx @@ -593,7 +593,7 @@ void BRepLib_MakeEdge2d::Init(const Handle(Geom2d_Curve)& CC, Standard_Real p2 = pp2; Standard_Real cf = C->FirstParameter(); Standard_Real cl = C->LastParameter(); - Standard_Real epsilon = Precision::Confusion(); + constexpr Standard_Real epsilon = Precision::Confusion(); Standard_Boolean periodic = C->IsPeriodic(); @@ -632,7 +632,7 @@ void BRepLib_MakeEdge2d::Init(const Handle(Geom2d_Curve)& CC, if (!p1inf) P1 = C->Value(p1); if (!p2inf) P2 = C->Value(p2); - Standard_Real preci = Precision::Confusion(); + constexpr Standard_Real preci = Precision::Confusion(); BRep_Builder B; // check for closed curve diff --git a/src/BRepLib/BRepLib_MakeFace.cxx b/src/BRepLib/BRepLib_MakeFace.cxx index ce7340bfe5..765ee0fe3d 100644 --- a/src/BRepLib/BRepLib_MakeFace.cxx +++ b/src/BRepLib/BRepLib_MakeFace.cxx @@ -559,7 +559,7 @@ void BRepLib_MakeFace::Init(const Handle(Geom_Surface)& SS, // adjust periodical surface or reordonate // check if the values are in the natural range - Standard_Real epsilon = Precision::PConfusion(); + constexpr Standard_Real epsilon = Precision::PConfusion(); BS->Bounds(umin,umax,vmin,vmax); diff --git a/src/BRepLib/BRepLib_MakeShell.cxx b/src/BRepLib/BRepLib_MakeShell.cxx index e29094422b..8e70c4b283 100644 --- a/src/BRepLib/BRepLib_MakeShell.cxx +++ b/src/BRepLib/BRepLib_MakeShell.cxx @@ -96,7 +96,7 @@ void BRepLib_MakeShell::Init(const Handle(Geom_Surface)& S, BS = RTS->BasisSurface(); } myError = BRepLib_EmptyShell; - Standard_Real tol = Precision::Confusion(); + constexpr Standard_Real tol = Precision::Confusion(); // Make a shell from a surface GeomAdaptor_Surface GS(BS,UMin,UMax,VMin,VMax); @@ -358,7 +358,7 @@ void BRepLib_MakeShell::Init(const Handle(Geom_Surface)& S, // Additional checking for degenerated edges Standard_Boolean isDegenerated; Standard_Real aFirst, aLast; - Standard_Real aTol = Precision::Confusion(); + constexpr Standard_Real aTol = Precision::Confusion(); Standard_Real anActTol; TopExp_Explorer anExp(myShape, TopAbs_EDGE); for ( ; anExp.More(); anExp.Next()) diff --git a/src/BRepLib/BRepLib_ToolTriangulatedShape.cxx b/src/BRepLib/BRepLib_ToolTriangulatedShape.cxx index 45d92a3d33..478977d237 100644 --- a/src/BRepLib/BRepLib_ToolTriangulatedShape.cxx +++ b/src/BRepLib/BRepLib_ToolTriangulatedShape.cxx @@ -46,7 +46,7 @@ void BRepLib_ToolTriangulatedShape::ComputeNormals (const TopoDS_Face& theFace, return; } - const Standard_Real aTol = Precision::Confusion(); + constexpr Standard_Real aTol = Precision::Confusion(); Standard_Integer aTri[3]; gp_Dir aNorm; theTris->AddNormals(); diff --git a/src/BRepMAT2d/BRepMAT2d_Explorer.cxx b/src/BRepMAT2d/BRepMAT2d_Explorer.cxx index c6ad6c6e60..250adff599 100644 --- a/src/BRepMAT2d/BRepMAT2d_Explorer.cxx +++ b/src/BRepMAT2d/BRepMAT2d_Explorer.cxx @@ -541,7 +541,7 @@ TopoDS_Edge MakeEdge(const Handle(Geom2d_Curve) &theCurve, { TopoDS_Edge aNewEdge; BRep_Builder aBuilder; - Standard_Real aTol = Precision::Confusion(); + constexpr Standard_Real aTol = Precision::Confusion(); Standard_Real aFPar = theCurve->FirstParameter(); Standard_Real aLPar = theCurve->LastParameter(); diff --git a/src/BRepMesh/BRepMesh_Classifier.cxx b/src/BRepMesh/BRepMesh_Classifier.cxx index 30f853cb84..81ae12d355 100644 --- a/src/BRepMesh/BRepMesh_Classifier.cxx +++ b/src/BRepMesh/BRepMesh_Classifier.cxx @@ -92,8 +92,8 @@ void BRepMesh_Classifier::RegisterWire( aPClass(1) = *p1; aPClass(2) = *p2; - const Standard_Real aAngTol = Precision::Angular(); - const Standard_Real aSqConfusion = + constexpr Standard_Real aAngTol = Precision::Angular(); + constexpr Standard_Real aSqConfusion = Precision::PConfusion() * Precision::PConfusion(); for (Standard_Integer i = 1; i <= aNbPnts; i++) diff --git a/src/BRepMesh/BRepMesh_CurveTessellator.cxx b/src/BRepMesh/BRepMesh_CurveTessellator.cxx index c8e942ec3a..d60f055da9 100644 --- a/src/BRepMesh/BRepMesh_CurveTessellator.cxx +++ b/src/BRepMesh/BRepMesh_CurveTessellator.cxx @@ -126,7 +126,7 @@ void BRepMesh_CurveTessellator::init() const Adaptor3d_CurveOnSurface& aCurve = myCurve.CurveOnSurface(); const Handle(Adaptor3d_Surface)& aSurface = aCurve.GetSurface(); - const Standard_Real aTol = Precision::Confusion(); + constexpr Standard_Real aTol = Precision::Confusion(); const Standard_Real aDu = aSurface->UResolution(aTol); const Standard_Real aDv = aSurface->VResolution(aTol); diff --git a/src/BRepMesh/BRepMesh_GeomTool.cxx b/src/BRepMesh/BRepMesh_GeomTool.cxx index ffa7649433..215085ffa7 100644 --- a/src/BRepMesh/BRepMesh_GeomTool.cxx +++ b/src/BRepMesh/BRepMesh_GeomTool.cxx @@ -419,7 +419,7 @@ BRepMesh_GeomTool::IntFlag BRepMesh_GeomTool::IntSegSeg( // Cross // Intersection is out of segments ranges - const Standard_Real aPrec = Precision::PConfusion(); + constexpr Standard_Real aPrec = Precision::PConfusion(); const Standard_Real aEndPrec = 1 - aPrec; for (Standard_Integer i = 0; i < 2; ++i) { @@ -492,7 +492,7 @@ Standard_Integer BRepMesh_GeomTool::classifyPoint( gp_XY aP1 = thePoint2 - thePoint1; gp_XY aP2 = thePointToCheck - thePoint1; - const Standard_Real aPrec = Precision::PConfusion(); + constexpr Standard_Real aPrec = Precision::PConfusion(); const Standard_Real aSqPrec = aPrec * aPrec; Standard_Real aDist = Abs(aP1 ^ aP2); if (aDist > aPrec) diff --git a/src/BRepMesh/BRepMesh_VertexTool.cxx b/src/BRepMesh/BRepMesh_VertexTool.cxx index 3393f92497..20b40bdc41 100644 --- a/src/BRepMesh/BRepMesh_VertexTool.cxx +++ b/src/BRepMesh/BRepMesh_VertexTool.cxx @@ -67,7 +67,7 @@ BRepMesh_VertexTool::BRepMesh_VertexTool( myCellFilter(0., myAllocator), mySelector (myAllocator) { - const Standard_Real aTol = Precision::Confusion(); + constexpr Standard_Real aTol = Precision::Confusion(); SetCellSize ( aTol + 0.05 * aTol ); SetTolerance( aTol, aTol ); } diff --git a/src/BRepOffset/BRepOffset.cxx b/src/BRepOffset/BRepOffset.cxx index 84b411df82..59c275e450 100644 --- a/src/BRepOffset/BRepOffset.cxx +++ b/src/BRepOffset/BRepOffset.cxx @@ -49,7 +49,7 @@ Handle(Geom_Surface) BRepOffset::Surface(const Handle(Geom_Surface)& Surface, BRepOffset_Status& theStatus, Standard_Boolean allowC0) { - Standard_Real Tol = Precision::Confusion(); + constexpr Standard_Real Tol = Precision::Confusion(); theStatus = BRepOffset_Good; Handle(Geom_Surface) Result; diff --git a/src/BRepOffset/BRepOffset_Inter2d.cxx b/src/BRepOffset/BRepOffset_Inter2d.cxx index 8b35e9301f..c4faa80db1 100644 --- a/src/BRepOffset/BRepOffset_Inter2d.cxx +++ b/src/BRepOffset/BRepOffset_Inter2d.cxx @@ -1044,7 +1044,7 @@ static Standard_Boolean ExtendPCurve(const Handle(Geom2d_Curve)& aPCurve, Handle(Geom2d_Line) aLin; Handle(Geom2d_TrimmedCurve) aSegment; Geom2dConvert_CompCurveToBSplineCurve aCompCurve(aTrCurve, Convert_RationalC1); - Standard_Real aTol = Precision::Confusion(); + constexpr Standard_Real aTol = Precision::Confusion(); Standard_Real aDelta = Max(a2Offset, 1.); if (FirstPar > anEf - a2Offset) { @@ -1462,7 +1462,7 @@ Standard_Boolean BRepOffset_Inter2d::ExtentEdge(const TopoDS_Edge& E,TopoDS_Edge Handle(Geom_Line) aLin; Handle(Geom_TrimmedCurve) aSegment; GeomConvert_CompCurveToBSplineCurve aCompCurve(aTrCurve, Convert_RationalC1); - Standard_Real aTol = Precision::Confusion(); + constexpr Standard_Real aTol = Precision::Confusion(); Standard_Real aDelta = Max(a2Offset, 1.); if (FirstPar > anEf - a2Offset) { @@ -1523,7 +1523,7 @@ static Standard_Boolean UpdateVertex(const TopoDS_Vertex& V, Standard_Real Of = OC.FirstParameter(); Standard_Real Ol = OC.LastParameter(); Standard_Real Nf = NC.FirstParameter(); Standard_Real Nl = NC.LastParameter(); Standard_Real U = 0.; - Standard_Real ParTol = Precision::PConfusion(); + constexpr Standard_Real ParTol = Precision::PConfusion(); gp_Pnt P = BRep_Tool::Pnt(V); Standard_Boolean OK = Standard_False; diff --git a/src/BRepOffset/BRepOffset_MakeOffset.cxx b/src/BRepOffset/BRepOffset_MakeOffset.cxx index 3602b39500..f206ad96aa 100644 --- a/src/BRepOffset/BRepOffset_MakeOffset.cxx +++ b/src/BRepOffset/BRepOffset_MakeOffset.cxx @@ -4573,7 +4573,7 @@ Standard_Boolean TrimEdge(TopoDS_Edge& NE, BOPTools_AlgoTools::MakeSplitEdge(NE, V1, aT1, V2, aT2, aSourceEdge); // // - Standard_Real aSameParTol = Precision::Confusion(); + constexpr Standard_Real aSameParTol = Precision::Confusion(); Standard_Real U = 0.; Standard_Real UMin = Precision::Infinite(); diff --git a/src/BRepOffset/BRepOffset_Offset.cxx b/src/BRepOffset/BRepOffset_Offset.cxx index bd37bcab0b..1d9fe87641 100644 --- a/src/BRepOffset/BRepOffset_Offset.cxx +++ b/src/BRepOffset/BRepOffset_Offset.cxx @@ -1252,7 +1252,7 @@ void BRepOffset_Offset::Init(const TopoDS_Edge& Path, if ( IsClosed) Edge4 = Edge3; - Standard_Real TolApp = Precision::Approximation(); + constexpr Standard_Real TolApp = Precision::Approximation(); Handle(Geom2d_Line) L1,L2; if ( IsClosed) { diff --git a/src/BRepOffset/BRepOffset_Tool.cxx b/src/BRepOffset/BRepOffset_Tool.cxx index 6c08941e18..b02989e089 100644 --- a/src/BRepOffset/BRepOffset_Tool.cxx +++ b/src/BRepOffset/BRepOffset_Tool.cxx @@ -326,7 +326,7 @@ static void BuildPCurves (const TopoDS_Edge& E, if (!C2d.IsNull()) return; //Standard_Real Tolerance = Max(Precision::Confusion(),BRep_Tool::Tolerance(E)); - Standard_Real Tolerance = Precision::Confusion(); + constexpr Standard_Real Tolerance = Precision::Confusion(); BRepAdaptor_Surface AS(F,0); BRepAdaptor_Curve AC(E); @@ -586,7 +586,7 @@ Standard_Boolean BRepOffset_Tool::FindCommonShapes(const TopoDS_Shape& theS1, static Standard_Boolean ToSmall (const Handle(Geom_Curve)& C) { - Standard_Real Tol = 10*Precision::Confusion(); + constexpr Standard_Real Tol = 10*Precision::Confusion(); Standard_Real m = (C->FirstParameter()*0.668 + C->LastParameter()*0.332); gp_Pnt P1 = C->Value(C->FirstParameter()); gp_Pnt P2 = C->Value(C->LastParameter()); @@ -1530,7 +1530,7 @@ void BRepOffset_Tool::Inter3D(const TopoDS_Face& F1, } } - Standard_Real aSameParTol = Precision::Confusion(); + constexpr Standard_Real aSameParTol = Precision::Confusion(); Standard_Boolean isEl1 = Standard_False, isEl2 = Standard_False; Handle(Geom_Surface) aSurf = BRep_Tool::Surface(F1); @@ -2519,7 +2519,7 @@ static void MakeFace(const Handle(Geom_Surface)& S, // compute vertices BRep_Builder B; - Standard_Real tol = Precision::Confusion(); + constexpr Standard_Real tol = Precision::Confusion(); TopoDS_Vertex V00,V10,V11,V01; @@ -3716,7 +3716,7 @@ void BRepOffset_Tool::ExtentFace (const TopoDS_Face& F, TopoDS_Vertex NV1,NV2; TopAbs_Orientation Or; Standard_Real U1,U2; - Standard_Real eps = Precision::Confusion(); + constexpr Standard_Real eps = Precision::Confusion(); #ifdef OCCT_DEBUG TopLoc_Location L; @@ -3969,7 +3969,7 @@ static Standard_Boolean IsInOut (BRepTopAdaptor_FClass2d& FC, const Geom2dAdaptor_Curve& AC, const TopAbs_State& S ) { - Standard_Real Def = 100*Precision::Confusion(); + constexpr Standard_Real Def = 100*Precision::Confusion(); GCPnts_QuasiUniformDeflection QU(AC,Def); for (Standard_Integer i = 1; i <= QU.NbPoints(); i++) { diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MiddlePath.cxx b/src/BRepOffsetAPI/BRepOffsetAPI_MiddlePath.cxx index 25d8297b72..9aee337faa 100644 --- a/src/BRepOffsetAPI/BRepOffsetAPI_MiddlePath.cxx +++ b/src/BRepOffsetAPI/BRepOffsetAPI_MiddlePath.cxx @@ -138,7 +138,7 @@ static Standard_Boolean IsValidEdge(const TopoDS_Edge& theEdge, TopoDS_Vertex V1, V2; TopExp::Vertices(theEdge, V1, V2); - Standard_Real Tol = Precision::Confusion(); + constexpr Standard_Real Tol = Precision::Confusion(); Standard_Integer i; TopExp_Explorer Explo(theFace, TopAbs_EDGE); diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_ThruSections.cxx b/src/BRepOffsetAPI/BRepOffsetAPI_ThruSections.cxx index fcbdd4ba76..8998eea655 100644 --- a/src/BRepOffsetAPI/BRepOffsetAPI_ThruSections.cxx +++ b/src/BRepOffsetAPI/BRepOffsetAPI_ThruSections.cxx @@ -99,7 +99,7 @@ static Standard_Real PreciseUpar(const Standard_Real anUpar, const Handle(Geom_BSplineSurface)& aSurface) { - Standard_Real Tol = Precision::PConfusion(); + constexpr Standard_Real Tol = Precision::PConfusion(); Standard_Integer i1, i2; aSurface->LocateU(anUpar, Tol, i1, i2); diff --git a/src/BRepSweep/BRepSweep_Trsf.cxx b/src/BRepSweep/BRepSweep_Trsf.cxx index b1649a7dd9..6676c13d99 100644 --- a/src/BRepSweep/BRepSweep_Trsf.cxx +++ b/src/BRepSweep/BRepSweep_Trsf.cxx @@ -89,7 +89,7 @@ Standard_Boolean BRepSweep_Trsf::Process(const TopoDS_Shape& aGenS, void BRepSweep_Trsf::SetContinuity(const TopoDS_Shape& aGenS, const Sweep_NumShape& aDirS) { - Standard_Real tl = Precision::Confusion(), tol3d; + constexpr Standard_Real tl = Precision::Confusion(); //angular etant un peu severe pour les contours sketches. Standard_Real ta = 0.00175;//environ 0.1 degre GeomAbs_Shape cont; @@ -103,7 +103,7 @@ void BRepSweep_Trsf::SetContinuity(const TopoDS_Shape& aGenS, TopExp::Vertices(E,d,f); if(d.IsSame(f)){ // tol3d = Max(tl,BRep_Tool::Tolerance(d)); - tol3d = Max(tl,2.*BRep_Tool::Tolerance(d));//IFV 24.05.00 buc60684 + const Standard_Real tol3d = Max(tl,2.*BRep_Tool::Tolerance(d));//IFV 24.05.00 buc60684 e.Initialize(E); ud = BRep_Tool::Parameter(d,TopoDS::Edge(aGenS)); uf = BRep_Tool::Parameter(f,TopoDS::Edge(aGenS)); @@ -155,7 +155,7 @@ void BRepSweep_Trsf::SetContinuity(const TopoDS_Shape& aGenS, u1 = BRep_Tool::Parameter(V,E1); u2 = BRep_Tool::Parameter(V,E2); // tol3d = Max(tl,BRep_Tool::Tolerance(V)); - tol3d = Max(tl,2.*BRep_Tool::Tolerance(V)); //IFV 24.05.00 buc60684 + const Standard_Real tol3d = Max(tl,2.*BRep_Tool::Tolerance(V)); //IFV 24.05.00 buc60684 e1.Initialize(E1); e2.Initialize(E2); cont = BRepLProp::Continuity(e1,e2,u1,u2,tol3d,ta); diff --git a/src/BRepTest/BRepTest_CurveCommands.cxx b/src/BRepTest/BRepTest_CurveCommands.cxx index 11a49f95c0..aaa48b9979 100644 --- a/src/BRepTest/BRepTest_CurveCommands.cxx +++ b/src/BRepTest/BRepTest_CurveCommands.cxx @@ -1743,7 +1743,7 @@ Standard_Integer edgeintersector(Draw_Interpretor& di, BRep_Builder B; Standard_Integer NbV = 0; - Standard_Real Tol = Precision::PConfusion(); + constexpr Standard_Real Tol = Precision::PConfusion(); Standard_Boolean rejectreducedsegmentpoints = Standard_True; EInter.InitPoint(rejectreducedsegmentpoints); diff --git a/src/BRepTest/BRepTest_OtherCommands.cxx b/src/BRepTest/BRepTest_OtherCommands.cxx index a6e860adee..92c3558d31 100644 --- a/src/BRepTest/BRepTest_OtherCommands.cxx +++ b/src/BRepTest/BRepTest_OtherCommands.cxx @@ -533,7 +533,7 @@ TopoDS_Face NextFaceForPrism (const TopoDS_Shape& shape, if (ASI.IsDone()) { Standard_Integer no=1, IndFrom, IndTo; TopAbs_Orientation theOr; - Standard_Real min = 1.e-04, Tol = -Precision::Confusion(); + constexpr Standard_Real min = 1.e-04, Tol = -Precision::Confusion(); if (ASI.LocalizeAfter (no, min, Tol, theOr, IndFrom, IndTo)) { nextFace = ASI.Point(no, IndFrom).Face(); break; diff --git a/src/BRepTools/BRepTools.cxx b/src/BRepTools/BRepTools.cxx index 91e9cbf436..b70d7b44a7 100644 --- a/src/BRepTools/BRepTools.cxx +++ b/src/BRepTools/BRepTools.cxx @@ -217,7 +217,7 @@ void BRepTools::AddUVBounds(const TopoDS_Face& aF, if (aS->DynamicType() == STANDARD_TYPE(Geom_BSplineSurface) && (aXmin < aUmin || aXmax > aUmax)) { - Standard_Real aTol2 = 100 * Precision::Confusion() * Precision::Confusion(); + constexpr Standard_Real aTol2 = 100 * Precision::Confusion() * Precision::Confusion(); isUPeriodic = Standard_True; gp_Pnt P1, P2; // 1. Verify that the surface is U-closed @@ -298,7 +298,7 @@ void BRepTools::AddUVBounds(const TopoDS_Face& aF, if (aS->DynamicType() == STANDARD_TYPE(Geom_BSplineSurface) && (aYmin < aVmin || aYmax > aVmax)) { - Standard_Real aTol2 = 100 * Precision::Confusion() * Precision::Confusion(); + constexpr Standard_Real aTol2 = 100 * Precision::Confusion() * Precision::Confusion(); isVPeriodic = Standard_True; gp_Pnt P1, P2; // 1. Verify that the surface is V-closed diff --git a/src/BiTgte/BiTgte_Blend.cxx b/src/BiTgte/BiTgte_Blend.cxx index c4f76cb668..060ca69b0f 100644 --- a/src/BiTgte/BiTgte_Blend.cxx +++ b/src/BiTgte/BiTgte_Blend.cxx @@ -223,7 +223,7 @@ static void KPartCurve3d(const TopoDS_Edge& Edge, // if not found call BRepLib::BuildCurve3d TopLoc_Location Loc; - Standard_Real Tol = Precision::Confusion(); + constexpr Standard_Real Tol = Precision::Confusion(); // Search only isos on analytical surfaces. Geom2dAdaptor_Curve C(Curve); @@ -429,7 +429,7 @@ Handle(Geom_Curve) MakeCurve (const BiTgte_CurveOnEdge& HC) MakeCurve_Function F(HC); Standard_Integer Deg1, Deg2; Deg1 = Deg2 = 8; - Standard_Real Tol = Precision::Approximation(); + constexpr Standard_Real Tol = Precision::Approximation(); Approx_FitAndDivide Fit(F,Deg1,Deg2,Tol,Tol,Standard_True); Standard_Integer i; Standard_Integer NbCurves = Fit.NbMultiCurves(); @@ -552,7 +552,7 @@ static TopoDS_Edge MakeDegeneratedEdge(const Handle(Geom_Curve)& CC, const TopoDS_Vertex& VfOnE) { BRep_Builder B; - Standard_Real Tol = Precision::Confusion(); + constexpr Standard_Real Tol = Precision::Confusion(); // kill trimmed curves Handle(Geom_Curve) C = CC; Handle(Geom_TrimmedCurve) CT = Handle(Geom_TrimmedCurve)::DownCast(C); diff --git a/src/Bisector/Bisector_BisecAna.cxx b/src/Bisector/Bisector_BisecAna.cxx index 64a31618a3..a761efe77c 100644 --- a/src/Bisector/Bisector_BisecAna.cxx +++ b/src/Bisector/Bisector_BisecAna.cxx @@ -224,7 +224,7 @@ void Bisector_BisecAna::Perform(const Handle(Geom2d_Curve)& afirstcurve , Standard_Boolean thesense = Standard_False,sense; Standard_Real distancemini; Standard_Integer nbsolution; - Standard_Real PreConf = Precision::Confusion(); + constexpr Standard_Real PreConf = Precision::Confusion(); Handle(Standard_Type) type1 = afirstcurve->DynamicType(); Handle(Standard_Type) type2 = asecondcurve->DynamicType(); diff --git a/src/Bisector/Bisector_BisecCC.cxx b/src/Bisector/Bisector_BisecCC.cxx index 07f29490ce..cf981d3a27 100644 --- a/src/Bisector/Bisector_BisecCC.cxx +++ b/src/Bisector/Bisector_BisecCC.cxx @@ -121,7 +121,7 @@ void Bisector_BisecCC::Perform(const Handle(Geom2d_Curve)& Cu1, Standard_Real U,UC1,UC2,Dist,dU,USol; gp_Pnt2d P; Standard_Integer NbPnts = 21; - Standard_Real EpsMin = 10*Precision::Confusion(); + constexpr Standard_Real EpsMin = 10*Precision::Confusion(); Standard_Boolean YaPoly = Standard_True; Standard_Boolean OriInPoly = Standard_False; //--------------------------------------------- @@ -1626,8 +1626,8 @@ Standard_Real Bisector_BisecCC::SearchBound (const Standard_Real U1, Standard_Real UMid,Dist1,Dist2,DistMid,U11,U22; Standard_Real UC1,UC2; gp_Pnt2d PBis,PBisPrec; - Standard_Real TolPnt = Precision::Confusion(); - Standard_Real TolPar = Precision::PConfusion(); + constexpr Standard_Real TolPnt = Precision::Confusion(); + constexpr Standard_Real TolPar = Precision::PConfusion(); U11 = U1; U22 = U2; PBisPrec = ValueByInt(U11,UC1,UC2,Dist1); PBis = ValueByInt(U22,UC1,UC2,Dist2); diff --git a/src/Bisector/Bisector_BisecPC.cxx b/src/Bisector/Bisector_BisecPC.cxx index 5ee0290a45..cbbdc256d8 100644 --- a/src/Bisector/Bisector_BisecPC.cxx +++ b/src/Bisector/Bisector_BisecPC.cxx @@ -610,7 +610,7 @@ Standard_Real Bisector_BisecPC::SearchBound (const Standard_Real U1, { Standard_Real Dist1,DistMid,U11,U22; Standard_Real UMid = 0.; - Standard_Real Tol = Precision::PConfusion(); + constexpr Standard_Real Tol = Precision::PConfusion(); Standard_Real DistMax2 = distMax*distMax; U11 = U1; U22 = U2; Dist1 = Distance(U11); @@ -758,7 +758,7 @@ Standard_Boolean Bisector_BisecPC::IsEmpty() const //========================================================================== Standard_Real Bisector_BisecPC::Parameter(const gp_Pnt2d& P) const { - Standard_Real Tol = Precision::Confusion(); + constexpr Standard_Real Tol = Precision::Confusion(); if (P.IsEqual(pointStartBis,Tol)) {return startIntervals.Value(bisInterval);} if (P.IsEqual(pointEndBis ,Tol)) {return endIntervals .Value(bisInterval);} diff --git a/src/Bisector/Bisector_Inter.cxx b/src/Bisector/Bisector_Inter.cxx index 47911ac581..5213fb0392 100644 --- a/src/Bisector/Bisector_Inter.cxx +++ b/src/Bisector/Bisector_Inter.cxx @@ -324,7 +324,7 @@ void Bisector_Inter::NeighbourPerform(const Handle(Bisector_BisecCC)& Bis1, { Standard_Real USol,U1,U2,Dist; Standard_Real UMin =0.,UMax =0.; - Standard_Real Eps = Precision::PConfusion(); + constexpr Standard_Real Eps = Precision::PConfusion(); gp_Pnt2d PSol; Handle(Geom2d_Curve) Guide; diff --git a/src/BndLib/BndLib.cxx b/src/BndLib/BndLib.cxx index adbd0238bc..1d8f87d82b 100644 --- a/src/BndLib/BndLib.cxx +++ b/src/BndLib/BndLib.cxx @@ -1144,8 +1144,8 @@ static void ComputeSphere (const gp_Sphere& Sphere, zmin = P.Z() - R; zmax = P.Z() + R; - Standard_Real uper = 2. * M_PI - Precision::PConfusion(); - Standard_Real vper = M_PI - Precision::PConfusion(); + constexpr Standard_Real uper = 2. * M_PI - Precision::PConfusion(); + constexpr Standard_Real vper = M_PI - Precision::PConfusion(); if (UMax - UMin >= uper && VMax - VMin >= vper) { // a whole sphere @@ -1244,7 +1244,7 @@ static void computeDegeneratedTorus (const gp_Torus& theTorus, Standard_Real aPhi = ACos (-aRa / aRi); - Standard_Real anUper = 2. * M_PI - Precision::PConfusion(); + constexpr Standard_Real anUper = 2. * M_PI - Precision::PConfusion(); Standard_Real aVper = 2. * aPhi - Precision::PConfusion(); if (theUMax - theUMin >= anUper && theVMax - theVMin >= aVper) { diff --git a/src/BndLib/BndLib_Add2dCurve.cxx b/src/BndLib/BndLib_Add2dCurve.cxx index ad454b8a94..3a61c34b48 100644 --- a/src/BndLib/BndLib_Add2dCurve.cxx +++ b/src/BndLib/BndLib_Add2dCurve.cxx @@ -495,7 +495,7 @@ void BndLib_Box2dCurve::PerformBSpline() } // - const Standard_Real eps = Precision::PConfusion(); + constexpr Standard_Real eps = Precision::PConfusion(); if (fabs(aT1-aTb[0]) > eps || fabs(aT2-aTb[1]) > eps) { aG=aCBS->Copy(); // diff --git a/src/ChFiKPart/ChFiKPart_ComputeData_FilPlnCyl.cxx b/src/ChFiKPart/ChFiKPart_ComputeData_FilPlnCyl.cxx index 4090e7a9ba..5f0570977b 100644 --- a/src/ChFiKPart/ChFiKPart_ComputeData_FilPlnCyl.cxx +++ b/src/ChFiKPart/ChFiKPart_ComputeData_FilPlnCyl.cxx @@ -118,7 +118,7 @@ Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr, Standard_Real UOnCyl,VOnCyl,UOnPln,VOnPln; ElSLib::Parameters(Cyl,OrFillet,UOnCyl,VOnCyl); - Standard_Real tesp = Precision::Confusion(); + constexpr Standard_Real tesp = Precision::Confusion(); if(UOnCyl < fu - tesp || UOnCyl > lu + tesp) UOnCyl = ElCLib::InPeriod(UOnCyl,fu,fu+2*M_PI); ElSLib::Parameters(Pln,OrFillet,UOnPln,VOnPln); diff --git a/src/Contap/Contap_Contour.cxx b/src/Contap/Contap_Contour.cxx index 16d2d58625..180c858c18 100644 --- a/src/Contap/Contap_Contour.cxx +++ b/src/Contap/Contap_Contour.cxx @@ -284,7 +284,7 @@ static void LineConstructor(Contap_TheSequenceOfLine& slin, //-- ------------------------------------------------------------ //-- on decoupe la ligne en portions entre 2 vertex - Standard_Real Tol = Precision::PConfusion(); + constexpr Standard_Real Tol = Precision::PConfusion(); Contap_IType typl = L.TypeContour(); //-- std::cout<<"\n ----------- Ligne Constructor "<FirstParameter(), LastPar = GC->LastParameter(); - Standard_Real pconf = Precision::PConfusion(); + constexpr Standard_Real pconf = Precision::PConfusion(); if (Abs( paramf - LastPar ) <= pconf) { paramf = FirstPar; diff --git a/src/Draft/Draft_Modification_1.cxx b/src/Draft/Draft_Modification_1.cxx index ecbc035bc0..c671c3604f 100644 --- a/src/Draft/Draft_Modification_1.cxx +++ b/src/Draft/Draft_Modification_1.cxx @@ -1587,7 +1587,7 @@ void Draft_Modification::Perform () { // pf >= pl Standard_Real FirstPar = theCurve->FirstParameter(), LastPar = theCurve->LastParameter(); - Standard_Real pconf = Precision::PConfusion(); + constexpr Standard_Real pconf = Precision::PConfusion(); if (Abs( pf - LastPar ) <= pconf) pf = FirstPar; else if (Abs( pl - FirstPar ) <= pconf) @@ -2074,7 +2074,7 @@ static Standard_Real SmartParameter(Draft_EdgeInfo& Einf, const Handle(Geom_Surface)& S2) { Handle( Geom2d_Curve ) NewC2d; - Standard_Real Tol = Precision::Confusion(); + constexpr Standard_Real Tol = Precision::Confusion(); Standard_Real Etol = EdgeTol; Handle( Geom2d_Curve ) pcu1 = Einf.FirstPC(); diff --git a/src/DsgPrs/DsgPrs.cxx b/src/DsgPrs/DsgPrs.cxx index 63f4e5494e..ed2a4afd6a 100644 --- a/src/DsgPrs/DsgPrs.cxx +++ b/src/DsgPrs/DsgPrs.cxx @@ -228,7 +228,7 @@ void DsgPrs::ComputeCurvilinearFacesLengthPresentation( const Standard_Real Firs GeomAPI_ProjectPointOnCurve ProjectorOnCurve; Standard_Real U1, V1, U2, V2; Standard_Real LastU, LastV; - Standard_Real SquareTolerance = Precision::SquareConfusion(); + constexpr Standard_Real SquareTolerance = Precision::SquareConfusion(); ProjectorOnSurface.Init( AttachmentPoint1, SecondSurf ); Standard_Integer Index(1); diff --git a/src/Extrema/Extrema_ExtElCS.cxx b/src/Extrema/Extrema_ExtElCS.cxx index 937f7c3bad..a899ac6069 100644 --- a/src/Extrema/Extrema_ExtElCS.cxx +++ b/src/Extrema/Extrema_ExtElCS.cxx @@ -459,7 +459,7 @@ void Extrema_ExtElCS::Perform(const gp_Circ& C, Standard_Integer aNbExt = anExtC.NbExt(); Standard_Integer i; Standard_Integer aCurI = 1; - Standard_Real aTolConf = Precision::Confusion(); + constexpr Standard_Real aTolConf = Precision::Confusion(); Standard_Real aCylRad = S.Radius(); // Check whether two objects have intersection points diff --git a/src/Extrema/Extrema_ExtPElC.cxx b/src/Extrema/Extrema_ExtPElC.cxx index 53514f594b..3752888033 100644 --- a/src/Extrema/Extrema_ExtPElC.cxx +++ b/src/Extrema/Extrema_ExtPElC.cxx @@ -143,7 +143,7 @@ void Extrema_ExtPElC::Perform(const gp_Pnt& P, Standard_Real Usol[2]; Usol[0] = C.XAxis().Direction().AngleWithRef(OPp,Axe); // -M_PI -aAngTol ) diff --git a/src/Extrema/Extrema_FuncExtCS.cxx b/src/Extrema/Extrema_FuncExtCS.cxx index 78b2146d63..6ade0b9d93 100644 --- a/src/Extrema/Extrema_FuncExtCS.cxx +++ b/src/Extrema/Extrema_FuncExtCS.cxx @@ -206,7 +206,7 @@ Standard_Integer Extrema_FuncExtCS::GetStateNumber() std::cout <<"F(1)= "< aPrecision) @@ -506,7 +506,7 @@ void GCPnts_TangentialDeflection::PerformCurve (const TheCurve& theC) Standard_Real Du, Dusave, MiddleU, L1, L2; Standard_Real U1 = myFirstu; - Standard_Real LTol = Precision::Confusion(); // protection longueur nulle + constexpr Standard_Real LTol = Precision::Confusion(); // protection longueur nulle Standard_Real ATol = 1.e-2 * myAngularDeflection; if (ATol > 1.e-2) { diff --git a/src/GccAna/GccAna_Circ2dBisec.cxx b/src/GccAna/GccAna_Circ2dBisec.cxx index 6b44e754d0..d732619986 100644 --- a/src/GccAna/GccAna_Circ2dBisec.cxx +++ b/src/GccAna/GccAna_Circ2dBisec.cxx @@ -51,7 +51,7 @@ GccAna_Circ2dBisec:: //========================================================================= WellDone = Standard_False; - Standard_Real Tol=Precision::Confusion(); + constexpr Standard_Real Tol=Precision::Confusion(); Standard_Real R1 = Circ1.Radius(); Standard_Real R2 = Circ2.Radius(); diff --git a/src/Geom/Geom_OffsetSurface.cxx b/src/Geom/Geom_OffsetSurface.cxx index 19c62e901c..28330dd547 100644 --- a/src/Geom/Geom_OffsetSurface.cxx +++ b/src/Geom/Geom_OffsetSurface.cxx @@ -216,7 +216,7 @@ void Geom_OffsetSurface::SetBasisSurface (const Handle(Geom_Surface)& S, // et la mettre en champ, on pourrait utiliser par exemple pour l'extraction d'iso // et aussi pour les singularite. Pour les surfaces osculatrices, on l'utilise pour // detecter si une iso est degeneree. - const Standard_Real Tol = Precision::Confusion(); //0.0001; + constexpr Standard_Real Tol = Precision::Confusion(); //0.0001; myOscSurf = new Geom_OsculatingSurface(aCheckingSurf, Tol); } @@ -802,7 +802,7 @@ Handle(Geom_Surface) Geom_OffsetSurface::Surface() const { if (offsetValue == 0.0) return basisSurf; // Cas direct - Standard_Real Tol = Precision::Confusion(); + constexpr Standard_Real Tol = Precision::Confusion(); Handle(Geom_Surface) Result, Base; Result.Nullify(); Handle(Standard_Type) TheType = basisSurf->DynamicType(); diff --git a/src/Geom2dGcc/Geom2dGcc_Circ2d2TanRadGeo.cxx b/src/Geom2dGcc/Geom2dGcc_Circ2d2TanRadGeo.cxx index 379a9d767d..7973269623 100644 --- a/src/Geom2dGcc/Geom2dGcc_Circ2d2TanRadGeo.cxx +++ b/src/Geom2dGcc/Geom2dGcc_Circ2d2TanRadGeo.cxx @@ -855,7 +855,7 @@ pararg2(1,aNbSolMAX) Intp.Perform(C1,C2,Tol,Tol); if (Intp.IsDone()) { if (!Intp.IsEmpty()) { - const Standard_Real aSQApproxTol = Precision::Approximation() * + constexpr Standard_Real aSQApproxTol = Precision::Approximation() * Precision::Approximation(); for (Standard_Integer i = 1; i <= Intp.NbPoints() && NbrSol < aNbSolMAX; i++) { diff --git a/src/GeomAPI/GeomAPI_ExtremaCurveCurve.cxx b/src/GeomAPI/GeomAPI_ExtremaCurveCurve.cxx index b25ebf8667..eabd77c701 100644 --- a/src/GeomAPI/GeomAPI_ExtremaCurveCurve.cxx +++ b/src/GeomAPI/GeomAPI_ExtremaCurveCurve.cxx @@ -81,7 +81,7 @@ void GeomAPI_ExtremaCurveCurve::Init myTotalExt = Standard_False; - Standard_Real Tol = Precision::PConfusion(); + constexpr Standard_Real Tol = Precision::PConfusion(); myC1.Load(C1); myC2.Load(C2); @@ -123,7 +123,7 @@ void GeomAPI_ExtremaCurveCurve::Init myTotalExt = Standard_False; - Standard_Real Tol = Precision::PConfusion(); + constexpr Standard_Real Tol = Precision::PConfusion(); myC1.Load(C1); myC2.Load(C2); diff --git a/src/GeomAPI/GeomAPI_ExtremaCurveSurface.cxx b/src/GeomAPI/GeomAPI_ExtremaCurveSurface.cxx index c77fdb07a0..a7f45b9e90 100644 --- a/src/GeomAPI/GeomAPI_ExtremaCurveSurface.cxx +++ b/src/GeomAPI/GeomAPI_ExtremaCurveSurface.cxx @@ -81,7 +81,7 @@ void GeomAPI_ExtremaCurveSurface::Init GeomAdaptor_Curve TheCurve (Curve); GeomAdaptor_Surface TheSurface (Surface); - Standard_Real Tol = Precision::PConfusion(); + constexpr Standard_Real Tol = Precision::PConfusion(); myExtCS.Initialize (TheSurface, Tol, Tol); myExtCS.Perform (TheCurve, TheCurve.FirstParameter(), TheCurve.LastParameter()); myIsDone = myExtCS.IsDone() && (myExtCS.IsParallel() || myExtCS.NbExt() > 0); @@ -122,7 +122,7 @@ void GeomAPI_ExtremaCurveSurface::Init GeomAdaptor_Curve TheCurve (Curve, Wmin, Wmax); GeomAdaptor_Surface TheSurface (Surface, Umin, Umax, Vmin, Vmax); - Standard_Real Tol = Precision::PConfusion(); + constexpr Standard_Real Tol = Precision::PConfusion(); myExtCS.Initialize (TheSurface, Umin,Umax,Vmin,Vmax,Tol,Tol); myExtCS.Perform (TheCurve, Wmin, Wmax); diff --git a/src/GeomAPI/GeomAPI_ExtremaSurfaceSurface.cxx b/src/GeomAPI/GeomAPI_ExtremaSurfaceSurface.cxx index 8a844f4491..a5958c4090 100644 --- a/src/GeomAPI/GeomAPI_ExtremaSurfaceSurface.cxx +++ b/src/GeomAPI/GeomAPI_ExtremaSurfaceSurface.cxx @@ -81,7 +81,7 @@ void GeomAPI_ExtremaSurfaceSurface::Init GeomAdaptor_Surface TheSurface1 (S1); GeomAdaptor_Surface TheSurface2 (S2); - Standard_Real Tol = Precision::PConfusion(); + constexpr Standard_Real Tol = Precision::PConfusion(); Extrema_ExtSS theExtSS(TheSurface1, TheSurface2,Tol,Tol); myExtSS = theExtSS; @@ -126,7 +126,7 @@ void GeomAPI_ExtremaSurfaceSurface::Init GeomAdaptor_Surface TheSurface1 (S1,U1min,U1max,V1min,V1max); GeomAdaptor_Surface TheSurface2 (S2,U2min,U2max,V2min,V2max); - Standard_Real Tol = Precision::PConfusion(); + constexpr Standard_Real Tol = Precision::PConfusion(); Extrema_ExtSS theExtSS(TheSurface1, TheSurface2, U1min,U1max,V1min,V1max, U2min,U2max,V2min,V2max, diff --git a/src/GeomAPI/GeomAPI_ProjectPointOnSurf.cxx b/src/GeomAPI/GeomAPI_ProjectPointOnSurf.cxx index c04bcce8af..1ab632dfb9 100644 --- a/src/GeomAPI/GeomAPI_ProjectPointOnSurf.cxx +++ b/src/GeomAPI/GeomAPI_ProjectPointOnSurf.cxx @@ -161,7 +161,7 @@ GeomAPI_ProjectPointOnSurf::GeomAPI_ProjectPointOnSurf() const Standard_Real Vsup, const Extrema_ExtAlgo theProjAlgo) { - Standard_Real Tolerance = Precision::PConfusion(); + constexpr Standard_Real Tolerance = Precision::PConfusion(); //modified by NIZNHY-PKV Thu Apr 4 10:38:23 2002 f //GeomAdaptor_Surface TheSurface (Surface,Umin,Usup,Vmin,Vsup); //myExtPS = Extrema_ExtPS (P, TheSurface, Tol, Tol); @@ -211,7 +211,7 @@ GeomAPI_ProjectPointOnSurf::GeomAPI_ProjectPointOnSurf() const Standard_Real Vsup, const Extrema_ExtAlgo theProjAlgo) { - Standard_Real Tolerance = Precision::PConfusion(); + constexpr Standard_Real Tolerance = Precision::PConfusion(); //modified by NIZNHY-PKV Thu Apr 4 10:41:50 2002 f //GeomAdaptor_Surface TheSurface (Surface,Umin,Usup,Vmin,Vsup); myGeomAdaptor.Load(Surface, Umin,Usup,Vmin,Vsup); diff --git a/src/GeomAdaptor/GeomAdaptor_Surface.cxx b/src/GeomAdaptor/GeomAdaptor_Surface.cxx index 816af616f9..4704fddc01 100644 --- a/src/GeomAdaptor/GeomAdaptor_Surface.cxx +++ b/src/GeomAdaptor/GeomAdaptor_Surface.cxx @@ -83,7 +83,7 @@ GeomAbs_Shape LocalContinuity(Standard_Integer Degree, Standard_Real newFirst, newLast; BSplCLib::LocateParameter(Degree,TK,TM,PFirst,IsPeriodic,1,Nb,Index1,newFirst); BSplCLib::LocateParameter(Degree,TK,TM,PLast, IsPeriodic,1,Nb,Index2,newLast ); - const Standard_Real EpsKnot = Precision::PConfusion(); + constexpr Standard_Real EpsKnot = Precision::PConfusion(); if (Abs(newFirst-TK(Index1+1))< EpsKnot) Index1++; if (Abs(newLast -TK(Index2 ))< EpsKnot) Index2--; // attention aux courbes peridiques. diff --git a/src/GeomAdaptor/GeomAdaptor_SurfaceOfRevolution.cxx b/src/GeomAdaptor/GeomAdaptor_SurfaceOfRevolution.cxx index 62eb29784e..955a55f1f9 100644 --- a/src/GeomAdaptor/GeomAdaptor_SurfaceOfRevolution.cxx +++ b/src/GeomAdaptor/GeomAdaptor_SurfaceOfRevolution.cxx @@ -307,7 +307,7 @@ void GeomAdaptor_SurfaceOfRevolution::VIntervals(TColStd_Array1OfReal& T, Handle(Adaptor3d_Surface) GeomAdaptor_SurfaceOfRevolution::UTrim (const Standard_Real First, const Standard_Real Last, const Standard_Real Tol) const { - const Standard_Real Eps = Precision::PConfusion(); + constexpr Standard_Real Eps = Precision::PConfusion(); (void )Eps; (void )First; (void )Last; (void )Tol; Standard_OutOfRange_Raise_if ( Abs(First) > Eps || Abs(Last - 2.*M_PI) > Eps, @@ -425,9 +425,9 @@ Standard_Real GeomAdaptor_SurfaceOfRevolution::VResolution GeomAbs_SurfaceType GeomAdaptor_SurfaceOfRevolution::GetType() const { - Standard_Real TolConf = Precision::Confusion(); - Standard_Real TolAng = Precision::Angular(); - Standard_Real TolConeSemiAng = Precision::Confusion(); + constexpr Standard_Real TolConf = Precision::Confusion(); + constexpr Standard_Real TolAng = Precision::Angular(); + constexpr Standard_Real TolConeSemiAng = Precision::Confusion(); switch (myBasisCurve->GetType()) { case GeomAbs_Line: { diff --git a/src/GeomConvert/GeomConvert_CurveToAnaCurve.cxx b/src/GeomConvert/GeomConvert_CurveToAnaCurve.cxx index b336e3741f..7193e08846 100644 --- a/src/GeomConvert/GeomConvert_CurveToAnaCurve.cxx +++ b/src/GeomConvert/GeomConvert_CurveToAnaCurve.cxx @@ -482,7 +482,7 @@ Handle(Geom_Curve) GeomConvert_CurveToAnaCurve::ComputeEllipse(const Handle(Geom } Handle(Geom_Curve) res; - Standard_Real prec = Precision::PConfusion(); + constexpr Standard_Real prec = Precision::PConfusion(); Standard_Real AF,BF,CF,DF,EF,Q1,Q2,Q3,c2n; Standard_Integer i; diff --git a/src/GeomConvert/GeomConvert_SurfToAnaSurf.cxx b/src/GeomConvert/GeomConvert_SurfToAnaSurf.cxx index 93635b193d..00296f8d15 100644 --- a/src/GeomConvert/GeomConvert_SurfToAnaSurf.cxx +++ b/src/GeomConvert/GeomConvert_SurfToAnaSurf.cxx @@ -249,7 +249,7 @@ Standard_Boolean GeomConvert_SurfToAnaSurf::GetCylByLS(const Handle(TColgp_HArra aLBnd(4) = aStartPoint(4) + aDR; // - Standard_Real aTol = Precision::Confusion(); + constexpr Standard_Real aTol = Precision::Confusion(); math_MultipleVarFunction* aPFunc; GeomConvert_FuncCylinderLSDist aFuncCyl(thePoints, thePos.Direction()); aPFunc = (math_MultipleVarFunction*)&aFuncCyl; @@ -767,7 +767,7 @@ Handle(Geom_Surface) GeomConvert_SurfToAnaSurf::ConvertToAnalytical(const Standa Standard_Real U1, U2, V1, V2; mySurf->Bounds(U1, U2, V1, V2); Standard_Boolean aDoSegment = Standard_False; - Standard_Real aTolBnd = Precision::PConfusion(); + constexpr Standard_Real aTolBnd = Precision::PConfusion(); Standard_Integer isurf = 0; if (Umin < U1 || Umax > U2 || Vmin < V1 || Vmax > V2) { diff --git a/src/GeomFill/GeomFill_BSplineCurves.cxx b/src/GeomFill/GeomFill_BSplineCurves.cxx index e0b1eceed5..fe251e0b77 100644 --- a/src/GeomFill/GeomFill_BSplineCurves.cxx +++ b/src/GeomFill/GeomFill_BSplineCurves.cxx @@ -259,7 +259,7 @@ void GeomFill_BSplineCurves::Init // On ordonne les courbes Handle(Geom_BSplineCurve) CC1, CC2, CC3, CC4; - Standard_Real Tol = Precision::Confusion(); + constexpr Standard_Real Tol = Precision::Confusion(); #ifndef No_Exception Standard_Boolean IsOK = #endif @@ -517,7 +517,7 @@ void GeomFill_BSplineCurves::Init } } else { - Standard_Real Eps = Precision::Confusion(); + constexpr Standard_Real Eps = Precision::Confusion(); Standard_Boolean IsOK = Standard_False; if ( CC1->StartPoint().IsEqual(CC2->StartPoint(),Eps)) { IsOK = Standard_True; diff --git a/src/GeomFill/GeomFill_BezierCurves.cxx b/src/GeomFill/GeomFill_BezierCurves.cxx index 5c939bc09d..d4045adcad 100644 --- a/src/GeomFill/GeomFill_BezierCurves.cxx +++ b/src/GeomFill/GeomFill_BezierCurves.cxx @@ -47,7 +47,7 @@ static void SetSameWeights(TColStd_Array1OfReal& W1, TColStd_Array1OfReal& W3, TColStd_Array1OfReal& W4 ) { - Standard_Real Eps = Precision::Confusion(); + constexpr Standard_Real Eps = Precision::Confusion(); Standard_Integer NU = W1.Length(); Standard_Integer NV = W2.Length(); @@ -213,7 +213,7 @@ void GeomFill_BezierCurves::Init(const Handle(Geom_BezierCurve)& C1, // On ordonne les courbes Handle(Geom_BezierCurve) CC1, CC2, CC3, CC4; - Standard_Real Tol = Precision::Confusion(); + constexpr Standard_Real Tol = Precision::Confusion(); #ifndef No_Exception Standard_Boolean IsOK = #endif @@ -417,7 +417,7 @@ void GeomFill_BezierCurves::Init(const Handle(Geom_BezierCurve)& C1, TColgp_Array1OfPnt P1(1,Deg1+1); TColgp_Array1OfPnt P2(1,Deg2+1); - Standard_Real Eps = Precision::Confusion(); + constexpr Standard_Real Eps = Precision::Confusion(); Standard_Boolean IsOK = Standard_False; if ( CC1->StartPoint().IsEqual(CC2->StartPoint(),Eps)) { IsOK = Standard_True; diff --git a/src/GeomFill/GeomFill_CircularBlendFunc.cxx b/src/GeomFill/GeomFill_CircularBlendFunc.cxx index 9bc250383b..7c3c05daa8 100644 --- a/src/GeomFill/GeomFill_CircularBlendFunc.cxx +++ b/src/GeomFill/GeomFill_CircularBlendFunc.cxx @@ -57,7 +57,7 @@ static void GeomFillFusInt(const TColStd_Array1OfReal& I1, TColStd_SequenceOfReal& Seq) { Standard_Integer ind1=1, ind2=1; - Standard_Real Epspar = Precision::PConfusion()*0.99; + constexpr Standard_Real Epspar = Precision::PConfusion()*0.99; // en suposant que le positionement fonctionne a PConfusion()/2 Standard_Real v1, v2; // Initialisations : les IND1 et IND2 pointent sur le 1er element @@ -591,7 +591,7 @@ Intervals(TColStd_Array1OfReal& T, const GeomAbs_Shape S) const void GeomFill_CircularBlendFunc::SetInterval(const Standard_Real First, const Standard_Real Last) { - Standard_Real Eps = Precision::PConfusion(); + constexpr Standard_Real Eps = Precision::PConfusion(); myTPath = myPath->Trim(First, Last, Eps); myTCurve1 = myCurve1->Trim(First, Last, Eps); myTCurve2 = myCurve2->Trim(First, Last, Eps); diff --git a/src/GeomFill/GeomFill_DiscreteTrihedron.cxx b/src/GeomFill/GeomFill_DiscreteTrihedron.cxx index 9738fec8ee..cc9c06e938 100755 --- a/src/GeomFill/GeomFill_DiscreteTrihedron.cxx +++ b/src/GeomFill/GeomFill_DiscreteTrihedron.cxx @@ -193,7 +193,7 @@ Standard_Boolean GeomFill_DiscreteTrihedron::D0(const Standard_Real Param, { //Locate in the sequence Standard_Integer Index = -1; - Standard_Real TolPar = Precision::PConfusion(); + constexpr Standard_Real TolPar = Precision::PConfusion(); //Standard_Real TolConf = Precision::Confusion(); Standard_Integer NbSamples = 10; gp_Pnt Origin(0.,0.,0.); diff --git a/src/GeomFill/GeomFill_Frenet.cxx b/src/GeomFill/GeomFill_Frenet.cxx index ff4f83319b..251a0598be 100644 --- a/src/GeomFill/GeomFill_Frenet.cxx +++ b/src/GeomFill/GeomFill_Frenet.cxx @@ -152,8 +152,10 @@ Standard_Boolean GeomFill_Frenet::SetCurve(const Handle(Adaptor3d_Curve)& C) { Standard_Integer i, j; GeomFill_SnglrFunc Func(myCurve); - Standard_Real TolF = 1.0e-10, Tol = 10*TolF, Tol2 = Tol * Tol, - PTol = Precision::PConfusion(); + constexpr Standard_Real TolF = 1.0e-10; + constexpr Standard_Real Tol = 10 * TolF; + constexpr Standard_Real Tol2 = Tol * Tol; + constexpr Standard_Real PTol = Precision::PConfusion(); // We want to determine if the curve has linear segments Standard_Integer NbIntC2 = myCurve->NbIntervals(GeomAbs_C2); diff --git a/src/GeomFill/GeomFill_NSections.cxx b/src/GeomFill/GeomFill_NSections.cxx index 9fd91d3fca..9c4250933a 100644 --- a/src/GeomFill/GeomFill_NSections.cxx +++ b/src/GeomFill/GeomFill_NSections.cxx @@ -356,7 +356,8 @@ GeomFill_NSections::GeomFill_NSections(const TColGeom_SequenceOfCurve& NC, } - Standard_Real ww, EpsW = 10*Precision::PConfusion(); + Standard_Real ww; + constexpr Standard_Real EpsW = 10*Precision::PConfusion(); Standard_Boolean NullWeight = Standard_False; if (!rational) DWeights.Init(0.); Standard_Integer indice = 1, ii; @@ -449,7 +450,8 @@ GeomFill_NSections::GeomFill_NSections(const TColGeom_SequenceOfCurve& NC, } - Standard_Real ww, EpsW = 10*Precision::PConfusion(); + Standard_Real ww; + constexpr Standard_Real EpsW = 10*Precision::PConfusion(); Standard_Boolean NullWeight = Standard_False; if (!rational) D2Weights.Init(0.); Standard_Integer indice = 1, ii; diff --git a/src/GeomFill/GeomFill_Pipe.cxx b/src/GeomFill/GeomFill_Pipe.cxx index 8362ab2622..70aec7c547 100644 --- a/src/GeomFill/GeomFill_Pipe.cxx +++ b/src/GeomFill/GeomFill_Pipe.cxx @@ -1091,8 +1091,8 @@ void GeomFill_Pipe::ApproxSurf(const Standard_Boolean WithParameters) { Handle(GeomFill_Line) Line = new GeomFill_Line(Section.NbSections()); Standard_Integer NbIt = 0; - Standard_Real T3d = Precision::Approximation(); - Standard_Real T2d = Precision::PApproximation(); + constexpr Standard_Real T3d = Precision::Approximation(); + constexpr Standard_Real T2d = Precision::PApproximation(); GeomFill_AppSweep App( 4, 8, T3d, T2d, NbIt, WithParameters); App.Perform( Line, Section, 30); diff --git a/src/GeomInt/GeomInt_IntSS_1.cxx b/src/GeomInt/GeomInt_IntSS_1.cxx index 9672735301..7f468486e6 100644 --- a/src/GeomInt/GeomInt_IntSS_1.cxx +++ b/src/GeomInt/GeomInt_IntSS_1.cxx @@ -59,7 +59,7 @@ if (aC2D.IsNull() || !aS->IsUPeriodic()) return; // - const Standard_Real aEps=Precision::PConfusion();//1.e-9 + constexpr Standard_Real aEps=Precision::PConfusion();//1.e-9 const Standard_Real aEpsilon=Epsilon(10.);//1.77e-15 // Standard_Real umin,umax,vmin,vmax; @@ -232,7 +232,7 @@ static Standard_Boolean isDegenerated(const Handle(GeomAdaptor_Surface)& theGAHS const Standard_Real theFirstPar, const Standard_Real theLastPar) { - const Standard_Real aSqTol = Precision::Confusion()*Precision::Confusion(); + constexpr Standard_Real aSqTol = Precision::Confusion()*Precision::Confusion(); gp_Pnt2d aP2d; gp_Pnt aP1, aP2; @@ -1309,7 +1309,7 @@ void GeomInt_IntSS::TrimILineOnSurfBoundaries(const Handle(Geom2d_Curve)& theC2d } } - const Standard_Real anIntTol = 10.0*Precision::Confusion(); + constexpr Standard_Real anIntTol = 10.0*Precision::Confusion(); IntersectCurveAndBoundary(theC2d1, aCurS1Bounds, aNumberOfCurves, anIntTol, theArrayOfParameters); diff --git a/src/GeomInt/GeomInt_LineConstructor.cxx b/src/GeomInt/GeomInt_LineConstructor.cxx index 9862f6fe1b..f87b409f4b 100644 --- a/src/GeomInt/GeomInt_LineConstructor.cxx +++ b/src/GeomInt/GeomInt_LineConstructor.cxx @@ -124,7 +124,7 @@ void GeomInt_LineConstructor::Perform(const Handle(IntPatch_Line)& L) { Standard_Integer i,nbvtx; Standard_Real firstp,lastp; - const Standard_Real Tol = Precision::PConfusion() * 35.0; + constexpr Standard_Real Tol = Precision::PConfusion() * 35.0; const IntPatch_IType typl = L->ArcType(); if(typl == IntPatch_Analytic) { @@ -862,7 +862,7 @@ void RejectDuplicates(NCollection_Array1& theVtxArr) // About the value aTolPC=1000.*Precision::PConfusion(), // see IntPatch_GLine::ComputeVertexParameters(...) // for more details; - const Standard_Real aTolPC = 1000.*Precision::PConfusion(); + constexpr Standard_Real aTolPC = 1000.*Precision::PConfusion(); //Find duplicates in a slice of the array [LowerBound, UpperBound-1]. //If a duplicate has been found, the element with greater index will be rejected. diff --git a/src/GeomInt/GeomInt_LineTool.cxx b/src/GeomInt/GeomInt_LineTool.cxx index 81b0c09598..27a5d68c22 100644 --- a/src/GeomInt/GeomInt_LineTool.cxx +++ b/src/GeomInt/GeomInt_LineTool.cxx @@ -64,7 +64,7 @@ void ProjectPointOnSurf::Init ( const Handle(Geom_Surface)& Surface, const Standard_Real Vmin, const Standard_Real Vsup ) { - const Standard_Real Tolerance = Precision::PConfusion(); + constexpr Standard_Real Tolerance = Precision::PConfusion(); // myGeomAdaptor.Load(Surface, Umin,Usup,Vmin,Vsup); myExtPS.Initialize(myGeomAdaptor, Umin, Usup, Vmin, Vsup, Tolerance, Tolerance); diff --git a/src/GeomLib/GeomLib.cxx b/src/GeomLib/GeomLib.cxx index f4767e7085..28d7af484a 100644 --- a/src/GeomLib/GeomLib.cxx +++ b/src/GeomLib/GeomLib.cxx @@ -1479,7 +1479,7 @@ void GeomLib::ExtendSurfByLength(Handle(Geom_BoundedSurface)& Surface, Handle(Geom_BSplineSurface)::DownCast (Surface); if (BS.IsNull()) { //BS = GeomConvert::SurfaceToBSplineSurface(Surface); - Standard_Real Tol = Precision::Confusion(); //1.e-4; + constexpr Standard_Real Tol = Precision::Confusion(); //1.e-4; GeomAbs_Shape UCont = GeomAbs_C1, VCont = GeomAbs_C1; Standard_Integer degU = 14, degV = 14; Standard_Integer nmax = 16; @@ -1509,7 +1509,7 @@ void GeomLib::ExtendSurfByLength(Handle(Geom_BoundedSurface)& Surface, // || ( !InU && BS->IsVRational() ) ; Standard_Boolean rational = (BS->IsURational() || BS->IsVRational()); Standard_Boolean NullWeight; - Standard_Real EpsW = 10*Precision::PConfusion(); + constexpr Standard_Real EpsW = 10*Precision::PConfusion(); Standard_Integer gap = 3; if ( rational ) gap++; diff --git a/src/GeomLib/GeomLib_IsPlanarSurface.cxx b/src/GeomLib/GeomLib_IsPlanarSurface.cxx index e2a5eb7102..82fb686ff9 100644 --- a/src/GeomLib/GeomLib_IsPlanarSurface.cxx +++ b/src/GeomLib/GeomLib_IsPlanarSurface.cxx @@ -40,7 +40,7 @@ static Standard_Boolean Controle(const TColgp_Array1OfPnt& Poles, Standard_Real gx,gy,gz; gp_Pnt Bary; gp_Dir DX, DY; - Standard_Real aTolSingular = Precision::Confusion(); + constexpr Standard_Real aTolSingular = Precision::Confusion(); GeomLib::Inertia(Poles, Bary, DX, DY, gx, gy, gz); diff --git a/src/GeomLib/GeomLib_Tool.cxx b/src/GeomLib/GeomLib_Tool.cxx index 2c38aed268..b6dc1fcb2e 100644 --- a/src/GeomLib/GeomLib_Tool.cxx +++ b/src/GeomLib/GeomLib_Tool.cxx @@ -344,7 +344,7 @@ Standard_Real GeomLib_Tool::ComputeDeviation(const Geom2dAdaptor_Curve& theCurve aFunc.GetLine(theLine); - const Standard_Real aTolDefl = Precision::PConfusion(); + constexpr Standard_Real aTolDefl = Precision::PConfusion(); Standard_Real aD1 = 0.0; Standard_Real aD2 = 0.0; diff --git a/src/GeomToIGES/GeomToIGES_GeomCurve.cxx b/src/GeomToIGES/GeomToIGES_GeomCurve.cxx index b0c4c47b60..28f8f1a681 100644 --- a/src/GeomToIGES/GeomToIGES_GeomCurve.cxx +++ b/src/GeomToIGES/GeomToIGES_GeomCurve.cxx @@ -194,7 +194,7 @@ static Standard_Boolean ArePolesPlanar (const TColgp_Array1OfPnt& Poles, for ( i = 1; i < Poles.Length(); i++) Normal += Poles ( i ).XYZ() ^ Poles ( i + 1 ).XYZ(); - Standard_Real tol = Precision::Confusion(); + constexpr Standard_Real tol = Precision::Confusion(); Standard_Real nrm = Normal.Modulus(); if ( nrm < tol ) { Normal.SetCoord ( 0, 0, 1 ); diff --git a/src/GeometryTest/GeometryTest_CurveCommands.cxx b/src/GeometryTest/GeometryTest_CurveCommands.cxx index 2e52fc6d11..c7cfe8b500 100644 --- a/src/GeometryTest/GeometryTest_CurveCommands.cxx +++ b/src/GeometryTest/GeometryTest_CurveCommands.cxx @@ -1076,7 +1076,7 @@ static Standard_Integer uniformAbscissa (Draw_Interpretor& di, Standard_Integer GeomAdaptor_Curve GAC(ellip); di<<"Type Of curve: "<pl) par-=M_PI+M_PI; if(parPrecisionPConfusion) { return; } @@ -396,7 +396,7 @@ void IntPatch_GLine::ComputeVertexParameters(const Standard_Real /*Tol*/) Standard_Integer nbvtx = NbVertex(); - const Standard_Real PrecisionPConfusion ( Precision::PConfusion()*1000.0 ); + constexpr Standard_Real PrecisionPConfusion ( Precision::PConfusion()*1000.0 ); do { APointDeleted = Standard_False; diff --git a/src/IntPatch/IntPatch_ImpPrmIntersection.cxx b/src/IntPatch/IntPatch_ImpPrmIntersection.cxx index ef7c959e0a..721998285f 100644 --- a/src/IntPatch/IntPatch_ImpPrmIntersection.cxx +++ b/src/IntPatch/IntPatch_ImpPrmIntersection.cxx @@ -2665,9 +2665,9 @@ static Standard_Boolean DecomposeResult(const Handle(IntPatch_PointLine)& theLin } const Standard_Real aDeltaUmax = M_PI_2; - const Standard_Real aTOL3D = 1.e-10, - aTOL2D = Precision::PConfusion(), - aTOL2DS = Precision::PConfusion(); + constexpr Standard_Real aTOL3D = 1.e-10, + aTOL2D = Precision::PConfusion(), + aTOL2DS = Precision::PConfusion(); const Handle(IntSurf_LineOn2S)& aSLine = theLine->Curve(); @@ -2801,7 +2801,7 @@ static Standard_Boolean DecomposeResult(const Handle(IntPatch_PointLine)& theLin //// const IntSurf_PntOn2S& aRefPt = aSSLine->Value(aBindex-1); - Standard_Real aCompareTol3D = Precision::Confusion(); + constexpr Standard_Real aCompareTol3D = Precision::Confusion(); Standard_Real aCompareTol2D = Precision::PConfusion(); IntSurf_PntOn2S aNewPoint = aRefPt; diff --git a/src/IntPatch/IntPatch_Intersection.cxx b/src/IntPatch/IntPatch_Intersection.cxx index b06c8513d1..aa28752f7f 100644 --- a/src/IntPatch/IntPatch_Intersection.cxx +++ b/src/IntPatch/IntPatch_Intersection.cxx @@ -1801,7 +1801,7 @@ Standard_Boolean IntPatch_Intersection::CheckSingularPoints( } // const Standard_Integer aNbBndPnts = 5; - const Standard_Real aTol = Precision::Confusion(); + constexpr Standard_Real aTol = Precision::Confusion(); Standard_Integer i; theD1->Init(); Standard_Boolean isU = Standard_True; @@ -1847,7 +1847,7 @@ Standard_Boolean IntPatch_Intersection::CheckSingularPoints( //Singular point aPP1; aPmid /= aNb; aPP1.SetXYZ(aPmid); - Standard_Real aTolU = Precision::PConfusion(), aTolV = Precision::PConfusion(); + constexpr Standard_Real aTolU = Precision::PConfusion(), aTolV = Precision::PConfusion(); Extrema_ExtPS aProj(aPP1, *theS2.get(), aTolU, aTolV, Extrema_ExtFlag_MIN); if (aProj.IsDone()) @@ -1883,7 +1883,7 @@ Standard_Real IntPatch_Intersection::DefineUVMaxStep( Standard_Real anUVMaxStep = 0.001; Standard_Real aDistToSing1 = Precision::Infinite(); Standard_Real aDistToSing2 = Precision::Infinite(); - const Standard_Real aTolMin = Precision::Confusion(), aTolMax = 1.e-5; + constexpr Standard_Real aTolMin = Precision::Confusion(), aTolMax = 1.e-5; if (theS1 != theS2) { Standard_Boolean isSing1 = CheckSingularPoints(theS1, theD1, theS2, aDistToSing1); diff --git a/src/IntPatch/IntPatch_PointLine.cxx b/src/IntPatch/IntPatch_PointLine.cxx index 6a3568f672..eb0489e876 100644 --- a/src/IntPatch/IntPatch_PointLine.cxx +++ b/src/IntPatch/IntPatch_PointLine.cxx @@ -49,8 +49,8 @@ Standard_Real IntPatch_PointLine:: const Handle(Adaptor3d_Surface)& theS2, const IntSurf_PntOn2S& theUVPoint) { - const Standard_Real aSmallValue = 1.0/Precision::Infinite(); - const Standard_Real aSqSmallValue = aSmallValue*aSmallValue; + constexpr Standard_Real aSmallValue = 1.0/Precision::Infinite(); + constexpr Standard_Real aSqSmallValue = aSmallValue*aSmallValue; Standard_Real aU1 = 0.0, aV1 = 0.0, aU2 = 0.0, aV2 = 0.0; theUVPoint.Parameters(aU1, aV1, aU2, aV2); diff --git a/src/IntPatch/IntPatch_PrmPrmIntersection.cxx b/src/IntPatch/IntPatch_PrmPrmIntersection.cxx index 9d5df4fca0..7b4b7fa768 100644 --- a/src/IntPatch/IntPatch_PrmPrmIntersection.cxx +++ b/src/IntPatch/IntPatch_PrmPrmIntersection.cxx @@ -1592,7 +1592,7 @@ void IntPatch_PrmPrmIntersection::Perform (const Handle(Adaptor3d_Surface)& S if (Surf1->IsUClosed() || Surf1->IsVClosed() || Surf2->IsUClosed() || Surf2->IsVClosed()) { - Standard_Real TolPar = Precision::PConfusion(); + constexpr Standard_Real TolPar = Precision::PConfusion(); IntSurf_ListOfPntOn2S AdditionalPnts; Standard_Real NewU1, NewV1, NewU2, NewV2; for(; IterLOP1.More(); IterLOP1.Next()) diff --git a/src/IntPatch/IntPatch_WLine.cxx b/src/IntPatch/IntPatch_WLine.cxx index 7cdb93daaf..b1b0a3fdab 100644 --- a/src/IntPatch/IntPatch_WLine.cxx +++ b/src/IntPatch/IntPatch_WLine.cxx @@ -464,7 +464,7 @@ void IntPatch_WLine::ComputeVertexParameters( const Standard_Real RTol) //---------------------------------------------------- //-- On detecte les points confondus dans la LineOn2S - Standard_Real dmini = Precision::SquareConfusion(); + constexpr Standard_Real dmini = Precision::SquareConfusion(); for(i=2; (i<=nbponline) && (nbponline > 2); i++) { const IntSurf_PntOn2S& aPnt1=curv->Value(i-1); const IntSurf_PntOn2S& aPnt2=curv->Value(i); diff --git a/src/IntPatch/IntPatch_WLineTool.cxx b/src/IntPatch/IntPatch_WLineTool.cxx index 766aca20e9..2c9e3928bd 100644 --- a/src/IntPatch/IntPatch_WLineTool.cxx +++ b/src/IntPatch/IntPatch_WLineTool.cxx @@ -445,7 +445,7 @@ static Handle(IntPatch_WLine) Standard_Real aPrevStep = aBase3dVec.SquareMagnitude(); // Choose base tolerance and scale it to pipe algorithm. - const Standard_Real aBaseTolerance = Precision::Approximation(); + constexpr Standard_Real aBaseTolerance = Precision::Approximation(); Standard_Real aResS1Tol = Min(theS1->UResolution(aBaseTolerance), theS1->VResolution(aBaseTolerance)); Standard_Real aResS2Tol = Min(theS2->UResolution(aBaseTolerance), diff --git a/src/IntWalk/IntWalk_PWalking.cxx b/src/IntWalk/IntWalk_PWalking.cxx index c665bb4e49..29162ef446 100644 --- a/src/IntWalk/IntWalk_PWalking.cxx +++ b/src/IntWalk/IntWalk_PWalking.cxx @@ -2143,7 +2143,7 @@ DistanceMinimizeByGradient( const Handle(Adaptor3d_Surface)& theASurf1, { const Standard_Integer aNbIterMAX = 60; const Standard_Real aTol = 1.0e-14; - const Standard_Real aTolNul = 1.0 / Precision::Infinite(); + constexpr Standard_Real aTolNul = 1.0 / Precision::Infinite(); // I.e. if theU1 = 0.0 then Epsilon(theU1) = DBL_MIN (~1.0e-308). // Work with this number is impossible: there is a dangerous to @@ -2676,7 +2676,7 @@ Standard_Boolean IntWalk_PWalking:: PutToBoundary(const Handle(Adaptor3d_Surface)& theASurf1, const Handle(Adaptor3d_Surface)& theASurf2) { - const Standard_Real aTolMin = Precision::Confusion(); + constexpr Standard_Real aTolMin = Precision::Confusion(); Standard_Boolean hasBeenAdded = Standard_False; diff --git a/src/LocOpe/LocOpe_FindEdgesInFace.cxx b/src/LocOpe/LocOpe_FindEdgesInFace.cxx index 4425e8a849..266775f9d3 100644 --- a/src/LocOpe/LocOpe_FindEdgesInFace.cxx +++ b/src/LocOpe/LocOpe_FindEdgesInFace.cxx @@ -59,8 +59,8 @@ void LocOpe_FindEdgesInFace::Set(const TopoDS_Shape& Sh, gp_Cylinder cy; - Standard_Real Tol = Precision::Confusion(); - Standard_Real TolAng = Precision::Angular(); + constexpr Standard_Real Tol = Precision::Confusion(); + constexpr Standard_Real TolAng = Precision::Angular(); S = BRep_Tool::Surface(F); Ts = S->DynamicType(); diff --git a/src/LocOpe/LocOpe_Generator.cxx b/src/LocOpe/LocOpe_Generator.cxx index 0c242f62eb..e1fdfe62ab 100644 --- a/src/LocOpe/LocOpe_Generator.cxx +++ b/src/LocOpe/LocOpe_Generator.cxx @@ -552,7 +552,7 @@ void LocOpe_Generator::Perform(const Handle(LocOpe_GeneratedShape)& G) // Tentative de recalage dans la facette pf = C2d->Value(f); pl = C2d->Value(l); - Standard_Real tttol = Precision::Angular(); + constexpr Standard_Real tttol = Precision::Angular(); while (Min(pf.X(),pl.X()) >= Umaxc-tttol) { C2d->Translate(gp_Vec2d(-2.*M_PI,0)); pf = C2d->Value(f); @@ -868,7 +868,7 @@ void LocOpe_Generator::Perform(const Handle(LocOpe_GeneratedShape)& G) // Tentative de recalage dans la facette pf = C2d->Value(f); pl = C2d->Value(l); - Standard_Real tttol = Precision::Angular(); + constexpr Standard_Real tttol = Precision::Angular(); while (Min(pf.X(),pl.X()) >= Umaxc - tttol) { C2d->Translate(gp_Vec2d(-2.*M_PI,0)); pf = C2d->Value(f); @@ -1057,8 +1057,8 @@ Standard_Boolean ToFuse(const TopoDS_Face& F1, Handle(Geom_Surface) S1,S2; TopLoc_Location loc1, loc2; Handle(Standard_Type) typS1,typS2; - const Standard_Real tollin = Precision::Confusion(); - const Standard_Real tolang = Precision::Angular(); + constexpr Standard_Real tollin = Precision::Confusion(); + constexpr Standard_Real tolang = Precision::Angular(); S1 = BRep_Tool::Surface(F1,loc1); S2 = BRep_Tool::Surface(F2,loc2); @@ -1115,8 +1115,8 @@ Standard_Boolean ToFuse(const TopoDS_Edge& E1, Handle(Geom_Curve) C1,C2; TopLoc_Location loc1, loc2; Handle(Standard_Type) typC1,typC2; - const Standard_Real tollin = Precision::Confusion(); - const Standard_Real tolang = Precision::Angular(); + constexpr Standard_Real tollin = Precision::Confusion(); + constexpr Standard_Real tolang = Precision::Angular(); Standard_Real f,l; C1 = BRep_Tool::Curve(E1,loc1,f,l); diff --git a/src/LocOpe/LocOpe_WiresOnShape.cxx b/src/LocOpe/LocOpe_WiresOnShape.cxx index 22b57eeb3d..6c33d80c54 100644 --- a/src/LocOpe/LocOpe_WiresOnShape.cxx +++ b/src/LocOpe/LocOpe_WiresOnShape.cxx @@ -810,7 +810,7 @@ void PutPCurve(const TopoDS_Edge& Edg, if (!V2.IsNull()) TolLast = BRep_Tool::Tolerance(V2); - Standard_Real tol2d = Precision::Confusion(); + constexpr Standard_Real tol2d = Precision::Confusion(); Handle(Geom2d_Curve) C2d; ShapeConstruct_ProjectCurveOnSurface aToolProj; aToolProj.Init(S, tol2d); @@ -855,7 +855,7 @@ void PutPCurve(const TopoDS_Edge& Edg, if (S->IsUPeriodic()) { Standard_Real up = S->UPeriod(); - Standard_Real tolu = Precision::PConfusion();// Epsilon(up); + constexpr Standard_Real tolu = Precision::PConfusion();// Epsilon(up); Standard_Integer nbtra = 0; Standard_Real theUmin = Min(pf.X(),pl.X()); Standard_Real theUmax = Max(pf.X(),pl.X()); @@ -880,7 +880,7 @@ void PutPCurve(const TopoDS_Edge& Edg, if (S->IsVPeriodic()) { Standard_Real vp = S->VPeriod(); - Standard_Real tolv = Precision::PConfusion();// Epsilon(vp); + constexpr Standard_Real tolv = Precision::PConfusion();// Epsilon(vp); Standard_Integer nbtra = 0; Standard_Real theVmin = Min(pf.Y(),pl.Y()); Standard_Real theVmax = Max(pf.Y(),pl.Y()); @@ -998,7 +998,7 @@ void PutPCurves(const TopoDS_Edge& Efrom, if (S->IsUPeriodic()) { Standard_Real up = S->UPeriod(); - Standard_Real tolu = Precision::PConfusion();// Epsilon(up); + constexpr Standard_Real tolu = Precision::PConfusion();// Epsilon(up); Standard_Integer nbtra = 0; Standard_Real theUmin = Min(pf.X(),pl.X()); Standard_Real theUmax = Max(pf.X(),pl.X()); @@ -1036,7 +1036,7 @@ void PutPCurves(const TopoDS_Edge& Efrom, if (S->IsVPeriodic()) { Standard_Real vp = S->VPeriod(); - Standard_Real tolv = Precision::PConfusion();// Epsilon(vp); + constexpr Standard_Real tolv = Precision::PConfusion();// Epsilon(vp); Standard_Integer nbtra = 0; Standard_Real theVmin = Min(pf.Y(),pl.Y()); Standard_Real theVmax = Max(pf.Y(),pl.Y()); @@ -1276,7 +1276,7 @@ void FindInternalIntersections(const TopoDS_Edge& theEdge, TopTools_IndexedDataMapOfShapeListOfShape& Splits, Standard_Boolean& isOverlapped) { - Standard_Real TolExt = Precision::PConfusion(); + constexpr Standard_Real TolExt = Precision::PConfusion(); Standard_Integer i, j; BRepAdaptor_Surface anAdSurf(theFace, Standard_False); diff --git a/src/MAT2d/MAT2d_Circuit.cxx b/src/MAT2d/MAT2d_Circuit.cxx index 8434853f67..0a6679010f 100644 --- a/src/MAT2d/MAT2d_Circuit.cxx +++ b/src/MAT2d/MAT2d_Circuit.cxx @@ -214,7 +214,7 @@ Standard_Boolean MAT2d_Circuit::IsSharpCorner(const Handle(Geom2d_Geometry)& Geo Standard_Real DotProd; Standard_Real ProVec = CrossProd (Geom1,Geom2,DotProd); Standard_Integer NbTest = 1; - Standard_Real DU = Precision::Confusion(); + constexpr Standard_Real DU = Precision::Confusion(); Handle(Geom2d_TrimmedCurve) C1,C2; C1= Handle(Geom2d_TrimmedCurve)::DownCast(Geom1); @@ -255,7 +255,7 @@ Standard_Boolean MAT2d_Circuit::IsSharpCorner(const Handle(Geom2d_Geometry)& Geo // Si pas dintersection => saillant. // Sinon => rentrant. Standard_Real D ; - Standard_Real Tol = Precision::Confusion(); + constexpr Standard_Real Tol = Precision::Confusion(); Standard_Real MilC1 = (C1->LastParameter() + C1->FirstParameter())*0.5; Standard_Real MilC2 = (C2->LastParameter() + C2->FirstParameter())*0.5; gp_Pnt2d P = C1->Value(C1->LastParameter()); diff --git a/src/MAT2d/MAT2d_CutCurve.cxx b/src/MAT2d/MAT2d_CutCurve.cxx index 2838d2f755..2a7fe57ffe 100644 --- a/src/MAT2d/MAT2d_CutCurve.cxx +++ b/src/MAT2d/MAT2d_CutCurve.cxx @@ -57,8 +57,8 @@ void MAT2d_CutCurve::Perform(const Handle(Geom2d_Curve)& C) Handle(Geom2d_TrimmedCurve) TrimC; Standard_Real UF,UL,UC; gp_Pnt2d PF,PL,PC; - Standard_Real PTol = Precision::PConfusion()*10; - Standard_Real Tol = Precision::Confusion()*10; + constexpr Standard_Real PTol = Precision::PConfusion()*10; + constexpr Standard_Real Tol = Precision::Confusion()*10; Standard_Boolean YaCut = Standard_False; Sommets.Perform (C); diff --git a/src/MeshVS/MeshVS_MeshPrsBuilder.cxx b/src/MeshVS/MeshVS_MeshPrsBuilder.cxx index 5e24b64a54..0f96542c4c 100644 --- a/src/MeshVS/MeshVS_MeshPrsBuilder.cxx +++ b/src/MeshVS/MeshVS_MeshPrsBuilder.cxx @@ -56,73 +56,69 @@ namespace // Function : ProcessFace // Purpose : Fill array with triangles for the face //================================================================ - static void ProcessFace(const Handle(MeshVS_HArray1OfSequenceOfInteger)& theTopo, + static void ProcessFace(const TColStd_SequenceOfInteger& theFaceNodes, const TColStd_Array1OfReal& theNodes, const Standard_Real* theCenter, - const Standard_Real theShrinkCoef, + const Standard_Real theShrinkCoef, const Standard_Boolean theIsShrinked, - const Standard_Boolean theIsShaded, + const Standard_Boolean theIsShaded, Handle(Graphic3d_ArrayOfPrimitives) theArray) { - for (Standard_Integer aFaceIdx = theTopo->Lower(); aFaceIdx <= theTopo->Upper(); ++aFaceIdx) + const Standard_Integer aNbPolyNodes = theFaceNodes.Length(); + + Standard_Real* aPolyNodesBuf = (Standard_Real*)alloca((3 * aNbPolyNodes + 1) * sizeof(Standard_Real)); + TColStd_Array1OfReal aPolyNodes(*aPolyNodesBuf, 0, 3 * aNbPolyNodes); + + for (Standard_Integer aNodeIdx = 0; aNodeIdx < aNbPolyNodes; ++aNodeIdx) { - const TColStd_SequenceOfInteger& aFaceNodes = theTopo->Value (aFaceIdx); - const Standard_Integer aNbPolyNodes = aFaceNodes.Length(); - - Standard_Real* aPolyNodesBuf = (Standard_Real*) alloca ((3 * aNbPolyNodes + 1) * sizeof (Standard_Real)); - TColStd_Array1OfReal aPolyNodes (*aPolyNodesBuf, 0, 3 * aNbPolyNodes); + Standard_Integer anIdx = theFaceNodes.Value(aNodeIdx + 1); + + Standard_Real aX = theNodes.Value(theNodes.Lower() + 3 * anIdx + 0); + Standard_Real aY = theNodes.Value(theNodes.Lower() + 3 * anIdx + 1); + Standard_Real aZ = theNodes.Value(theNodes.Lower() + 3 * anIdx + 2); - for (Standard_Integer aNodeIdx = 0; aNodeIdx < aNbPolyNodes; ++aNodeIdx) + if (theIsShrinked) { - Standard_Integer anIdx = aFaceNodes.Value (aNodeIdx + 1); + aX = theCenter[0] + theShrinkCoef * (aX - theCenter[0]); + aY = theCenter[1] + theShrinkCoef * (aY - theCenter[1]); + aZ = theCenter[2] + theShrinkCoef * (aZ - theCenter[2]); + } - Standard_Real aX = theNodes.Value (theNodes.Lower() + 3 * anIdx + 0); - Standard_Real aY = theNodes.Value (theNodes.Lower() + 3 * anIdx + 1); - Standard_Real aZ = theNodes.Value (theNodes.Lower() + 3 * anIdx + 2); + aPolyNodes.SetValue(3 * aNodeIdx + 1, aX); + aPolyNodes.SetValue(3 * aNodeIdx + 2, aY); + aPolyNodes.SetValue(3 * aNodeIdx + 3, aZ); + } - if (theIsShrinked) - { - aX = theCenter[0] + theShrinkCoef * (aX - theCenter[0]); - aY = theCenter[1] + theShrinkCoef * (aY - theCenter[1]); - aZ = theCenter[2] + theShrinkCoef * (aZ - theCenter[2]); - } + gp_Vec aNorm; - aPolyNodes.SetValue (3 * aNodeIdx + 1, aX); - aPolyNodes.SetValue (3 * aNodeIdx + 2, aY); - aPolyNodes.SetValue (3 * aNodeIdx + 3, aZ); - } - - gp_Vec aNorm; + if (theIsShaded) + { + aPolyNodes.SetValue(0, aNbPolyNodes); - if (theIsShaded) + if (!MeshVS_Tool::GetAverageNormal(aPolyNodes, aNorm)) { - aPolyNodes.SetValue (0, aNbPolyNodes); - - if (!MeshVS_Tool::GetAverageNormal (aPolyNodes, aNorm)) - { - aNorm.SetCoord (0.0, 0.0, 1.0); - } + aNorm.SetCoord(0.0, 0.0, 1.0); } + } - for (Standard_Integer aNodeIdx = 0; aNodeIdx < aNbPolyNodes - 2; ++aNodeIdx) // triangulate polygon + for (Standard_Integer aNodeIdx = 0; aNodeIdx < aNbPolyNodes - 2; ++aNodeIdx) // triangulate polygon + { + for (Standard_Integer aSubIdx = 0; aSubIdx < 3; ++aSubIdx) // generate sub-triangle { - for (Standard_Integer aSubIdx = 0; aSubIdx < 3; ++aSubIdx) // generate sub-triangle + if (theIsShaded) { - if (theIsShaded) - { - theArray->AddVertex (aPolyNodes.Value (3 * (aSubIdx == 0 ? 0 : (aNodeIdx + aSubIdx)) + 1), - aPolyNodes.Value (3 * (aSubIdx == 0 ? 0 : (aNodeIdx + aSubIdx)) + 2), - aPolyNodes.Value (3 * (aSubIdx == 0 ? 0 : (aNodeIdx + aSubIdx)) + 3), - aNorm.X(), - aNorm.Y(), - aNorm.Z()); - } - else - { - theArray->AddVertex (aPolyNodes.Value (3 * (aSubIdx == 0 ? 0 : (aNodeIdx + aSubIdx)) + 1), - aPolyNodes.Value (3 * (aSubIdx == 0 ? 0 : (aNodeIdx + aSubIdx)) + 2), - aPolyNodes.Value (3 * (aSubIdx == 0 ? 0 : (aNodeIdx + aSubIdx)) + 3)); - } + theArray->AddVertex(aPolyNodes.Value(3 * (aSubIdx == 0 ? 0 : (aNodeIdx + aSubIdx)) + 1), + aPolyNodes.Value(3 * (aSubIdx == 0 ? 0 : (aNodeIdx + aSubIdx)) + 2), + aPolyNodes.Value(3 * (aSubIdx == 0 ? 0 : (aNodeIdx + aSubIdx)) + 3), + aNorm.X(), + aNorm.Y(), + aNorm.Z()); + } + else + { + theArray->AddVertex(aPolyNodes.Value(3 * (aSubIdx == 0 ? 0 : (aNodeIdx + aSubIdx)) + 1), + aPolyNodes.Value(3 * (aSubIdx == 0 ? 0 : (aNodeIdx + aSubIdx)) + 2), + aPolyNodes.Value(3 * (aSubIdx == 0 ? 0 : (aNodeIdx + aSubIdx)) + 3)); } } } @@ -917,7 +913,10 @@ void MeshVS_MeshPrsBuilder::AddVolumePrs (const Handle(MeshVS_HArray1OfSequenceO if (aIsPolygons) { - ProcessFace (theTopo, theNodes, aCenter, theShrinkCoef, theIsShrinked, theIsShaded, theArray); + for (Standard_Integer aFaceIdx = theTopo->Lower(); aFaceIdx <= theTopo->Upper(); ++aFaceIdx) + { + ProcessFace(theTopo->Value(aFaceIdx), theNodes, aCenter, theShrinkCoef, theIsShrinked, theIsShaded, theArray); + } } else if (theIsSelected) { diff --git a/src/MeshVS/MeshVS_Tool.cxx b/src/MeshVS/MeshVS_Tool.cxx index a528a91a8f..28a02768af 100644 --- a/src/MeshVS/MeshVS_Tool.cxx +++ b/src/MeshVS/MeshVS_Tool.cxx @@ -264,8 +264,8 @@ Standard_Boolean MeshVS_Tool::GetNormal( const TColStd_Array1OfReal& Nodes, Standard_Boolean res = Standard_True; - Standard_Real normal[3], first_vec[3], cur_vec[3], xx, yy, zz, - conf = Precision::Confusion(); + Standard_Real normal[3], first_vec[3], cur_vec[3], xx, yy, zz; + constexpr Standard_Real conf = Precision::Confusion(); for( i=0; i<3; i++ ) { @@ -339,8 +339,8 @@ Standard_Boolean MeshVS_Tool::GetAverageNormal( const TColStd_Array1OfReal& Node Standard_Boolean res = Standard_True; - Standard_Real normal[3], first_vec[3], cur_vec[3], xx, yy, zz, - conf = Precision::Confusion(); + Standard_Real normal[3], first_vec[3], cur_vec[3], xx, yy, zz; + constexpr Standard_Real conf = Precision::Confusion(); for( i=0; i<3; i++ ) { diff --git a/src/ProjLib/ProjLib_CompProjectedCurve.cxx b/src/ProjLib/ProjLib_CompProjectedCurve.cxx index af709f85e3..f37d535d53 100644 --- a/src/ProjLib/ProjLib_CompProjectedCurve.cxx +++ b/src/ProjLib/ProjLib_CompProjectedCurve.cxx @@ -729,7 +729,7 @@ void ProjLib_CompProjectedCurve::Init() Standard_Boolean FromLastU = Standard_False, isSplitsComputed = Standard_False; - const Standard_Real aTolExt = Precision::PConfusion(); + constexpr Standard_Real aTolExt = Precision::PConfusion(); Extrema_ExtCS CExt (*myCurve, *mySurface, aTolExt, aTolExt); if (CExt.IsDone() && CExt.NbExt()) { diff --git a/src/ProjLib/ProjLib_ComputeApprox.cxx b/src/ProjLib/ProjLib_ComputeApprox.cxx index ec336d94db..aea77f5ac4 100644 --- a/src/ProjLib/ProjLib_ComputeApprox.cxx +++ b/src/ProjLib/ProjLib_ComputeApprox.cxx @@ -252,7 +252,7 @@ static void Function_SetUVBounds(Standard_Real& myU1, case GeomAbs_Cone: { Standard_Real tol = Epsilon(1.); - Standard_Real ptol = Precision::PConfusion(); + constexpr Standard_Real ptol = Precision::PConfusion(); gp_Cone Cone = mySurface->Cone(); VCouture = Standard_False; //Calculation of cone parameters for P == ConeApex often produces wrong diff --git a/src/ProjLib/ProjLib_ComputeApproxOnPolarSurface.cxx b/src/ProjLib/ProjLib_ComputeApproxOnPolarSurface.cxx index 3fe5728fcc..976a18ed67 100644 --- a/src/ProjLib/ProjLib_ComputeApproxOnPolarSurface.cxx +++ b/src/ProjLib/ProjLib_ComputeApproxOnPolarSurface.cxx @@ -673,7 +673,7 @@ Handle(Geom2d_BSplineCurve) ProjLib_ComputeApproxOnPolarSurface::Perform { //OCC217 Standard_Real Tol3d = myTolerance; - Standard_Real ParamTol = Precision::PApproximation(); + constexpr Standard_Real ParamTol = Precision::PApproximation(); Handle(Adaptor2d_Curve2d) AHC2d = InitialCurve2d; Handle(Adaptor3d_Curve) AHC = Curve; diff --git a/src/ProjLib/ProjLib_ProjectOnSurface.cxx b/src/ProjLib/ProjLib_ProjectOnSurface.cxx index de4cf1f20a..954439f683 100644 --- a/src/ProjLib/ProjLib_ProjectOnSurface.cxx +++ b/src/ProjLib/ProjLib_ProjectOnSurface.cxx @@ -91,7 +91,7 @@ class ProjLib_OnSurface : public AppCont_Function myNbPnt2d = 0; Standard_Real U = myCurve->FirstParameter(); gp_Pnt P = myCurve->Value(U); - Standard_Real Tol = Precision::PConfusion(); + constexpr Standard_Real Tol = Precision::PConfusion(); myExtPS = new Extrema_ExtPS (P, *S, Tol, Tol); } diff --git a/src/ProjLib/ProjLib_ProjectedCurve.cxx b/src/ProjLib/ProjLib_ProjectedCurve.cxx index f31bc78d57..a975f092fa 100644 --- a/src/ProjLib/ProjLib_ProjectedCurve.cxx +++ b/src/ProjLib/ProjLib_ProjectedCurve.cxx @@ -191,7 +191,7 @@ static void ExtendC2d (Handle(Geom2d_BSplineCurve)& aRes, gp_Dir2d aDBnd; Handle(Geom2d_TrimmedCurve) aSegment; Geom2dConvert_CompCurveToBSplineCurve aCompCurve(aRes, Convert_RationalC1); - Standard_Real aTol = Precision::Confusion(); + constexpr Standard_Real aTol = Precision::Confusion(); aRes->D1(theParam, aPBnd, aVBnd); aDBnd.SetXY(aVBnd.XY()); diff --git a/src/ProjLib/ProjLib_Sphere.cxx b/src/ProjLib/ProjLib_Sphere.cxx index ba04e89af5..6ee7b1f2d3 100644 --- a/src/ProjLib/ProjLib_Sphere.cxx +++ b/src/ProjLib/ProjLib_Sphere.cxx @@ -140,7 +140,7 @@ void ProjLib_Sphere::Project(const gp_Circ& C) Zs = mySphere.Position().Direction(); Standard_Boolean isIsoU, isIsoV; - Standard_Real Tol = Precision::Confusion(); + constexpr Standard_Real Tol = Precision::Confusion(); isIsoU = Zc.IsNormal(Zs,Tol) && O.IsEqual(C.Location(),Tol); isIsoV = Xc.IsNormal(Zs,Tol) && Yc.IsNormal(Zs,Tol); diff --git a/src/PrsDim/PrsDim_EqualDistanceRelation.cxx b/src/PrsDim/PrsDim_EqualDistanceRelation.cxx index cea28b70a9..9add584701 100644 --- a/src/PrsDim/PrsDim_EqualDistanceRelation.cxx +++ b/src/PrsDim/PrsDim_EqualDistanceRelation.cxx @@ -449,7 +449,7 @@ void PrsDim_EqualDistanceRelation::ComputeTwoEdgesLength( const Handle( Prs3d_Pr SecondAttach = ElCLib::Value(ElCLib::Parameter(l2,Position),l2); } - Standard_Real confusion(Precision::Confusion()); + constexpr Standard_Real confusion(Precision::Confusion()); if (arrsize < confusion) arrsize = Val*0.1; if (Abs(Val) <= confusion) {arrsize = 0.;} @@ -482,7 +482,7 @@ void PrsDim_EqualDistanceRelation::ComputeTwoEdgesLength( const Handle( Prs3d_Pr gp_Circ aCirc2 = aCir2->Circ(); //To avoid circles with different orientation - Standard_Real aTol = Precision::Confusion(); + constexpr Standard_Real aTol = Precision::Confusion(); if(aCirc2.Axis().IsOpposite(aCirc1.Axis(), aTol) || aCirc2.XAxis().IsOpposite(aCirc1.XAxis(), aTol) || aCirc2.YAxis().IsOpposite(aCirc1.YAxis(), aTol) ) @@ -594,7 +594,7 @@ void PrsDim_EqualDistanceRelation::ComputeTwoVerticesLength( const Handle( Prs3d PrsDim::ComputeGeometry( FirstVertex, FirstAttach, Plane, isOnPlane1); PrsDim::ComputeGeometry( SecondVertex, SecondAttach, Plane, isOnPlane2); - Standard_Real confusion(Precision::Confusion()); + constexpr Standard_Real confusion(Precision::Confusion()); Standard_Boolean samePoint(FirstAttach.IsEqual(SecondAttach,confusion)); if (TypeDist == PrsDim_TypeOfDist_Vertical) DirAttach = Plane->Pln().XAxis().Direction(); diff --git a/src/PrsDim/PrsDim_FixRelation.cxx b/src/PrsDim/PrsDim_FixRelation.cxx index b75a001d00..f9168467ca 100644 --- a/src/PrsDim/PrsDim_FixRelation.cxx +++ b/src/PrsDim/PrsDim_FixRelation.cxx @@ -282,7 +282,7 @@ gp_Pnt PrsDim_FixRelation::ComputePosition(const Handle(Geom_Curve)& curv1, if (!vec1.IsParallel(vec2, Precision::Angular()) ) { gp_Dir dir; - Standard_Real conf =Precision::Confusion(); + constexpr Standard_Real conf =Precision::Confusion(); if (lastp1.IsEqual(firstp2,conf) || firstp1.IsEqual(lastp2,conf)) dir.SetXYZ(vec1.XYZ() - vec2.XYZ()); else dir.SetXYZ(vec1.XYZ() + vec2.XYZ()); gp_Vec transvec = gp_Vec(dir)*myArrowSize; diff --git a/src/PrsDim/PrsDim_IdenticRelation.cxx b/src/PrsDim/PrsDim_IdenticRelation.cxx index 9d64752e6d..b3ce9e4206 100644 --- a/src/PrsDim/PrsDim_IdenticRelation.cxx +++ b/src/PrsDim/PrsDim_IdenticRelation.cxx @@ -165,7 +165,7 @@ static Standard_Boolean ComputeAttach(const gp_Circ& thecirc, // Case of confusion between the current position and the center // of the circle -> we move the current position - Standard_Real confusion (Precision::Confusion()); + constexpr Standard_Real confusion (Precision::Confusion()); gp_Pnt aCenter = thecirc.Location(); if ( aCenter.Distance(curpos) <= confusion ) { @@ -229,7 +229,7 @@ static Standard_Boolean ComputeAttach(const gp_Elips& theEll, // Case of confusion between the current position and the center // of the circle -> we move the current position - Standard_Real confusion (Precision::Confusion()); + constexpr Standard_Real confusion (Precision::Confusion()); gp_Pnt aCenter = theEll.Location(); if ( aCenter.Distance(curpos) <= confusion ) { @@ -364,7 +364,7 @@ void PrsDim_IdenticRelation::ComputeSelection(const Handle(SelectMgr_Selection)& Handle(Select3D_SensitiveSegment) seg; // attachment point of the segment linking position to the curve gp_Pnt attach; - Standard_Real confusion (Precision::Confusion()); + constexpr Standard_Real confusion (Precision::Confusion()); if ( myFAttach.IsEqual(mySAttach, confusion) ) { @@ -653,7 +653,7 @@ void PrsDim_IdenticRelation::ComputeTwoLinesPresentation(const Handle(Prs3d_Pres Standard_Real dist = thelin->Lin().Distance(curpos); gp_Pnt proj = ElCLib::Value( pcurpos, thelin->Lin()); gp_Vec trans; - Standard_Real confusion(Precision::Confusion()); + constexpr Standard_Real confusion(Precision::Confusion()); if ( dist >= confusion ) { trans = gp_Vec(proj, curpos); trans.Normalize(); @@ -702,7 +702,7 @@ void PrsDim_IdenticRelation::ComputeTwoCirclesPresentation(const Handle(Prs3d_Pr const gp_Pnt& firstp2, const gp_Pnt& lastp2) { - Standard_Real confusion (Precision::Confusion()); + constexpr Standard_Real confusion (Precision::Confusion()); // Searching of complete circles Standard_Boolean circ1complete = (firstp1.IsEqual(lastp1, confusion)); @@ -983,7 +983,7 @@ void PrsDim_IdenticRelation::ComputeNotAutoCircPresentation(const Handle(Geom_Ci // Case of confusion between the current position and the center // of the circle -> we move the current position - Standard_Real confusion (Precision::Confusion()); + constexpr Standard_Real confusion (Precision::Confusion()); if ( myCenter.Distance(curpos) <= confusion ) { gp_Vec vprec(myCenter, myFAttach); @@ -1057,7 +1057,7 @@ void PrsDim_IdenticRelation::ComputeTwoEllipsesPresentation(const Handle(Prs3d_P const gp_Pnt& firstp2, const gp_Pnt& lastp2) { - Standard_Real confusion (Precision::Confusion()); + constexpr Standard_Real confusion (Precision::Confusion()); // Searching of complete ellipses Standard_Boolean circ1complete = (firstp1.IsEqual(lastp1, confusion)); @@ -1339,7 +1339,7 @@ void PrsDim_IdenticRelation::ComputeNotAutoElipsPresentation(const Handle(Geom_E // Case of confusion between the current position and the center // of the ellipse -> we move the current position - Standard_Real confusion (Precision::Confusion()); + constexpr Standard_Real confusion (Precision::Confusion()); if ( myCenter.Distance(curpos) <= confusion ) { gp_Vec vprec(myCenter, myFAttach); diff --git a/src/PrsDim/PrsDim_MidPointRelation.cxx b/src/PrsDim/PrsDim_MidPointRelation.cxx index 74cec7d3bb..043b7f1ca2 100644 --- a/src/PrsDim/PrsDim_MidPointRelation.cxx +++ b/src/PrsDim/PrsDim_MidPointRelation.cxx @@ -442,7 +442,7 @@ void PrsDim_MidPointRelation::ComputePointsOnCirc(const gp_Circ& aCirc, // Case of confusion between the current position and the center // of the circle -> we move the current position - Standard_Real confusion (Precision::Confusion()); + constexpr Standard_Real confusion (Precision::Confusion()); gp_Pnt aCenter = aCirc.Location(); if ( aCenter.Distance(curpos) <= confusion ) { @@ -569,7 +569,7 @@ void PrsDim_MidPointRelation::ComputePointsOnElips(const gp_Elips& anEll, // Case of confusion between the current position and the center // of the circle -> we move the current position - Standard_Real confusion (Precision::Confusion()); + constexpr Standard_Real confusion (Precision::Confusion()); gp_Pnt aCenter = anEll.Location(); if ( aCenter.Distance(curpos) <= confusion ) { diff --git a/src/QABugs/QABugs_10.cxx b/src/QABugs/QABugs_10.cxx index ddb79f56b2..3580d65aa9 100644 --- a/src/QABugs/QABugs_10.cxx +++ b/src/QABugs/QABugs_10.cxx @@ -213,7 +213,7 @@ static Standard_Integer OCC486(Draw_Interpretor& di, Standard_Integer argc, cons if (GS.IsNull()) { di << "OCC486 FAULTY. Null surface /n";return 1;} gp_Pnt P3D( Draw::Atof(argv[2]),Draw::Atof(argv[3]),Draw::Atof(argv[4]) ); - Standard_Real Tol = Precision::PConfusion(); + constexpr Standard_Real Tol = Precision::PConfusion(); Extrema_ExtPS myExtPS; if (argc > 5) du = Draw::Atof(argv[5]); if (argc > 6) dv = Draw::Atof(argv[6]); diff --git a/src/QABugs/QABugs_11.cxx b/src/QABugs/QABugs_11.cxx index d871614a92..6750ed5f29 100644 --- a/src/QABugs/QABugs_11.cxx +++ b/src/QABugs/QABugs_11.cxx @@ -2648,7 +2648,7 @@ static Standard_Integer OCC8169 (Draw_Interpretor& di, Standard_Integer argc, co Handle(Geom_Surface) thePlane = BRep_Tool::Surface(theFace); - Standard_Real aConfusion = Precision::Confusion(); + constexpr Standard_Real aConfusion = Precision::Confusion(); Standard_Real aP1first, aP1last, aP2first, aP2last; Handle(Geom_Curve) aCurve1 = BRep_Tool::Curve(theEdge1, aP1first, aP1last); @@ -4680,7 +4680,7 @@ Standard_Integer OCC22736 (Draw_Interpretor& di, Standard_Integer argc, const ch gp_Trsf2d Tcomp; Tcomp = M2.Multiplied(M1); - Standard_Real aTol = Precision::Confusion(); + constexpr Standard_Real aTol = Precision::Confusion(); Standard_Integer aStatus = 0; //After applying two times the same mirror the point is located on the same location OK diff --git a/src/QABugs/QABugs_13.cxx b/src/QABugs/QABugs_13.cxx index 59e15d61e5..1437a183d9 100644 --- a/src/QABugs/QABugs_13.cxx +++ b/src/QABugs/QABugs_13.cxx @@ -772,7 +772,7 @@ static Standard_Integer OCC817 (Draw_Interpretor& di, Standard_Integer argc, con return 1; } - Standard_Real delt = 5.0*Precision::Confusion(); + constexpr Standard_Real delt = 5.0*Precision::Confusion(); Standard_Real mesh_delt = Draw::Atof(argv[2]); if (mesh_delt <= 0.0) { diff --git a/src/QABugs/QABugs_19.cxx b/src/QABugs/QABugs_19.cxx index c6f3d91c0e..418ea4d021 100644 --- a/src/QABugs/QABugs_19.cxx +++ b/src/QABugs/QABugs_19.cxx @@ -2013,7 +2013,7 @@ static Standard_Integer OCC24889 (Draw_Interpretor& theDI, DrawTrSurf::Set("c_2", aTrim[1]); // Intersection - const Standard_Real aTol = Precision::Confusion(); + constexpr Standard_Real aTol = Precision::Confusion(); Geom2dAPI_InterCurveCurve aIntTool( aTrim[0], aTrim[1], aTol ); const IntRes2d_IntersectionPoint& aIntPnt = @@ -3871,7 +3871,7 @@ Standard_Integer OCC26446 (Draw_Interpretor& di, TColGeom_Array1OfBSplineCurve aCurves (0, 1); TColStd_Array1OfReal aTolerances (0, 0); Standard_Real aTolConf = 1.e-3; - Standard_Real aTolClosure = Precision::Confusion(); + constexpr Standard_Real aTolClosure = Precision::Confusion(); Handle(TColGeom_HArray1OfBSplineCurve) aConcatCurves; Handle(TColStd_HArray1OfInteger) anIndices; diff --git a/src/QABugs/QABugs_20.cxx b/src/QABugs/QABugs_20.cxx index c76a27751f..5ccf50e54b 100644 --- a/src/QABugs/QABugs_20.cxx +++ b/src/QABugs/QABugs_20.cxx @@ -1613,8 +1613,8 @@ static Standard_Integer OCC27466(Draw_Interpretor& theDI, return 1; BRepAdaptor_Surface aSurf(aFace); - Standard_Real aTolU = Precision::PConfusion(); - Standard_Real aTolV = Precision::PConfusion(); + constexpr Standard_Real aTolU = Precision::PConfusion(); + constexpr Standard_Real aTolV = Precision::PConfusion(); Extrema_GenLocateExtPS anExtrema(aSurf, aTolU, aTolV); anExtrema.Perform(aPnt, aUV.X(), aUV.Y(), Standard_True); diff --git a/src/SWDRAW/SWDRAW_ShapeTool.cxx b/src/SWDRAW/SWDRAW_ShapeTool.cxx index 3efe62790c..c624af2600 100644 --- a/src/SWDRAW/SWDRAW_ShapeTool.cxx +++ b/src/SWDRAW/SWDRAW_ShapeTool.cxx @@ -195,7 +195,7 @@ static Standard_Integer samerange (Draw_Interpretor& di, Standard_Integer argc, Standard_Real oldLast = Draw::Atof(argv[4]); Standard_Real current_first = Draw::Atof(argv[5]); Standard_Real current_last = Draw::Atof(argv[6]); - Standard_Real Tol = Precision::PConfusion(); + constexpr Standard_Real Tol = Precision::PConfusion(); Handle(Geom2d_Curve) NewC2d; GeomLib::SameRange(Tol, C, oldFirst,oldLast, current_first, current_last, NewC2d); diff --git a/src/ShapeAlgo/ShapeAlgo_AlgoContainer.cxx b/src/ShapeAlgo/ShapeAlgo_AlgoContainer.cxx index 9b635a45fe..90baefa0c8 100644 --- a/src/ShapeAlgo/ShapeAlgo_AlgoContainer.cxx +++ b/src/ShapeAlgo/ShapeAlgo_AlgoContainer.cxx @@ -209,7 +209,7 @@ void ShapeAlgo_AlgoContainer::ApproxBSplineCurve (const Handle(Geom_BSplineCurve R->Add(POn2S); } GeomInt_WLApprox theapp3d; - Standard_Real Tol = Precision::Approximation(); + constexpr Standard_Real Tol = Precision::Approximation(); theapp3d.SetParameters(Tol, Tol, 4, 8, 0, 30, Standard_True); Handle(IntPatch_WLine) WL = new IntPatch_WLine(R, Standard_False); Standard_Integer indicemin = 1; @@ -341,7 +341,7 @@ void ShapeAlgo_AlgoContainer::ApproxBSplineCurve (const Handle(Geom2d_BSplineCur R->Add(POn2S); } GeomInt_WLApprox theapp3d; - Standard_Real Tol = Precision::PApproximation(); + constexpr Standard_Real Tol = Precision::PApproximation(); theapp3d.SetParameters(Tol, Tol, 4, 8, 0, 30, Standard_True); Handle(IntPatch_WLine) WL = new IntPatch_WLine(R, Standard_False); Standard_Integer indicemin = 1; diff --git a/src/ShapeAnalysis/ShapeAnalysis_CanonicalRecognition.cxx b/src/ShapeAnalysis/ShapeAnalysis_CanonicalRecognition.cxx index 71830f2c5b..f8982cd7aa 100644 --- a/src/ShapeAnalysis/ShapeAnalysis_CanonicalRecognition.cxx +++ b/src/ShapeAnalysis/ShapeAnalysis_CanonicalRecognition.cxx @@ -832,7 +832,7 @@ Standard_Boolean ShapeAnalysis_CanonicalRecognition::GetSurfaceByLS(const TopoDS aStartPoint, aFBnd, aLBnd, aRelDev); // - Standard_Real aTol = Precision::Confusion(); + constexpr Standard_Real aTol = Precision::Confusion(); math_MultipleVarFunction* aPFunc; GeomConvert_FuncSphereLSDist aFuncSph(aPoints); GeomConvert_FuncCylinderLSDist aFuncCyl(aPoints, thePos.Direction()); diff --git a/src/ShapeAnalysis/ShapeAnalysis_Edge.cxx b/src/ShapeAnalysis/ShapeAnalysis_Edge.cxx index 3a77d8d02f..81bbc08340 100644 --- a/src/ShapeAnalysis/ShapeAnalysis_Edge.cxx +++ b/src/ShapeAnalysis/ShapeAnalysis_Edge.cxx @@ -978,7 +978,7 @@ Standard_Boolean ShapeAnalysis_Edge::CheckPCurveRange (const Standard_Real theFi const Standard_Real theLast, const Handle(Geom2d_Curve)& thePC) { - const Standard_Real eps = Precision::PConfusion(); + constexpr Standard_Real eps = Precision::PConfusion(); Standard_Boolean isValid = Standard_True; Standard_Boolean IsPeriodic = thePC->IsPeriodic(); Standard_Real aPeriod = RealLast(); diff --git a/src/ShapeAnalysis/ShapeAnalysis_Surface.cxx b/src/ShapeAnalysis/ShapeAnalysis_Surface.cxx index 63fbb24801..da99c551d4 100644 --- a/src/ShapeAnalysis/ShapeAnalysis_Surface.cxx +++ b/src/ShapeAnalysis/ShapeAnalysis_Surface.cxx @@ -988,8 +988,8 @@ Standard_Integer ShapeAnalysis_Surface::SurfaceNewton(const gp_Pnt2d &p2dPrev, Standard_Real VF = vf - dv, VL = vl + dv; //Standard_Integer fail = 0; - Standard_Real Tol = Precision::Confusion(); - Standard_Real Tol2 = Tol * Tol;//, rs2p=1e10; + constexpr Standard_Real Tol = Precision::Confusion(); + constexpr Standard_Real Tol2 = Tol * Tol;//, rs2p=1e10; Standard_Real U = p2dPrev.X(), V = p2dPrev.Y(); gp_Vec rsfirst = P3D.XYZ() - Value(U, V).XYZ(); //pdn for (Standard_Integer i = 0; i < 25; i++) { @@ -1225,7 +1225,7 @@ gp_Pnt2d ShapeAnalysis_Surface::ValueOfUV(const gp_Pnt& P3D, const Standard_Real du = Min(myUDelt, SurfAdapt.UResolution(preci)); dv = Min(myVDelt, SurfAdapt.VResolution(preci)); } - Standard_Real Tol = Precision::PConfusion(); + constexpr Standard_Real Tol = Precision::PConfusion(); myExtPS.SetFlag(Extrema_ExtFlag_MIN); myExtPS.Initialize(SurfAdapt, uf - du, ul + du, vf - dv, vl + dv, Tol, Tol); myExtOK = Standard_True; @@ -1273,7 +1273,7 @@ gp_Pnt2d ShapeAnalysis_Surface::ValueOfUV(const gp_Pnt& P3D, const Standard_Real } if (disSurf < 10 * preci) if (mySurf->Continuity() != GeomAbs_C0) { - Standard_Real Tol = Precision::Confusion(); + constexpr Standard_Real Tol = Precision::Confusion(); gp_Vec D1U, D1V; gp_Pnt pnt; SurfAdapt.D1(UU, VV, pnt, D1U, D1V); diff --git a/src/ShapeAnalysis/ShapeAnalysis_TransferParametersProj.cxx b/src/ShapeAnalysis/ShapeAnalysis_TransferParametersProj.cxx index e655fd5b0f..d770fdc88e 100644 --- a/src/ShapeAnalysis/ShapeAnalysis_TransferParametersProj.cxx +++ b/src/ShapeAnalysis/ShapeAnalysis_TransferParametersProj.cxx @@ -123,7 +123,7 @@ Handle(TColStd_HSequenceOfReal) ShapeAnalysis_TransferParametersProj::Perform Handle(TColStd_HSequenceOfReal) resKnots = new TColStd_HSequenceOfReal; Standard_Integer len = Knots->Length(); - Standard_Real preci = 2*Precision::PConfusion(); + constexpr Standard_Real preci = 2*Precision::PConfusion(); Standard_Real first = (To2d ? myAC3d.FirstParameter() : myFirst); Standard_Real last = (To2d ? myAC3d.LastParameter() : myLast); @@ -277,7 +277,7 @@ void ShapeAnalysis_TransferParametersProj::TransferRange(TopoDS_Edge& newEdge, gp_Pnt p1; gp_Pnt p2; Standard_Real alpha = 0, beta = 1; - Standard_Real preci = Precision::PConfusion(); + constexpr Standard_Real preci = Precision::PConfusion(); Standard_Real firstPar, lastPar; if(prevPar < currPar) { firstPar = prevPar; diff --git a/src/ShapeAnalysis/ShapeAnalysis_WireOrder.cxx b/src/ShapeAnalysis/ShapeAnalysis_WireOrder.cxx index 0b8b34c4f0..f3552fef7c 100644 --- a/src/ShapeAnalysis/ShapeAnalysis_WireOrder.cxx +++ b/src/ShapeAnalysis/ShapeAnalysis_WireOrder.cxx @@ -262,8 +262,8 @@ void ShapeAnalysis_WireOrder::Perform (const Standard_Boolean /*closed*/) TColStd_Array1OfBoolean isEdgeUsed (1, aNbEdges); isEdgeUsed.Init (Standard_False); - Standard_Real aTol2 = Precision::SquareConfusion(); - Standard_Real aTolP2 = Precision::SquarePConfusion(); + constexpr Standard_Real aTol2 = Precision::SquareConfusion(); + constexpr Standard_Real aTolP2 = Precision::SquarePConfusion(); // take the first edge to the constructed chain isEdgeUsed (1) = Standard_True; diff --git a/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx b/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx index db1e6bedd5..79e1b1a750 100644 --- a/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx +++ b/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx @@ -2010,7 +2010,7 @@ InsertAdditionalPointOrAdjust(Standard_Boolean& ToAdjust, try { // RAJOUT OCC_CATCH_SIGNALS - Standard_Real prec = Precision::Confusion();//myPreci; + constexpr Standard_Real prec = Precision::Confusion();//myPreci; Standard_Boolean isoParam = Standard_False; isoPar2d3d = Standard_False; diff --git a/src/ShapeCustom/ShapeCustom_Curve2d.cxx b/src/ShapeCustom/ShapeCustom_Curve2d.cxx index 319d2bd015..2699d447e7 100644 --- a/src/ShapeCustom/ShapeCustom_Curve2d.cxx +++ b/src/ShapeCustom/ShapeCustom_Curve2d.cxx @@ -72,7 +72,7 @@ Standard_Boolean ShapeCustom_Curve2d::IsLinear(const TColgp_Array1OfPnt2d& thePo } } - Standard_Real dPreci = Precision::PConfusion()*Precision::PConfusion(); + constexpr Standard_Real dPreci = Precision::PConfusion()*Precision::PConfusion(); if(dMax < dPreci) return Standard_False; diff --git a/src/ShapeFix/ShapeFix_ComposeShell.cxx b/src/ShapeFix/ShapeFix_ComposeShell.cxx index 45bc2f6e93..426de169a8 100644 --- a/src/ShapeFix/ShapeFix_ComposeShell.cxx +++ b/src/ShapeFix/ShapeFix_ComposeShell.cxx @@ -2607,7 +2607,7 @@ void ShapeFix_ComposeShell::DispatchWires (TopTools_SequenceOfShape &faces, Handle(Geom2d_Curve) c21 = BRep_Tool::CurveOnSurface(E,myFace,f1,l1); TopoDS_Shape dummy = E.Reversed(); Handle(Geom2d_Curve) c22 = BRep_Tool::CurveOnSurface(TopoDS::Edge(dummy),myFace,f2,l2); - Standard_Real dPreci = ::Precision::PConfusion()*Precision::PConfusion(); + constexpr Standard_Real dPreci = ::Precision::PConfusion()*Precision::PConfusion(); gp_Pnt2d pf1 = c21->Value(f1); gp_Pnt2d pl1 = c21->Value(l1); gp_Pnt2d pf2 = c22->Value(f2); diff --git a/src/ShapeFix/ShapeFix_Edge.cxx b/src/ShapeFix/ShapeFix_Edge.cxx index dcd5d29a18..faf56732d6 100644 --- a/src/ShapeFix/ShapeFix_Edge.cxx +++ b/src/ShapeFix/ShapeFix_Edge.cxx @@ -390,7 +390,7 @@ static Handle(Geom2d_Curve) TranslatePCurve (const Handle(Geom_Surface)& aSurf, Standard_Real oldFirstCurve1 = oldFirst, oldLastCurve1 = oldLast; if(Curve2dPtr->IsKind(STANDARD_TYPE(Geom2d_BezierCurve))) { - Standard_Real preci = Precision::PConfusion(); + constexpr Standard_Real preci = Precision::PConfusion(); if ( Abs(oldFirst) > preci || Abs(oldLast-1) > preci ) { Handle(Geom2d_BezierCurve) bezier = Handle(Geom2d_BezierCurve)::DownCast(Curve2dPtr->Copy()); bezier->Segment(oldFirst,oldLast); @@ -412,7 +412,7 @@ static Handle(Geom2d_Curve) TranslatePCurve (const Handle(Geom_Surface)& aSurf, if(Curve2dPtr2->IsKind(STANDARD_TYPE(Geom2d_BezierCurve))) { - Standard_Real preci = Precision::PConfusion(); + constexpr Standard_Real preci = Precision::PConfusion(); if ( Abs(oldFirst) > preci || Abs(oldLast-1) > preci ) { Handle(Geom2d_BezierCurve) bezier = Handle(Geom2d_BezierCurve)::DownCast(Curve2dPtr2->Copy()); bezier->Segment(oldFirst,oldLast); diff --git a/src/ShapeFix/ShapeFix_EdgeProjAux.cxx b/src/ShapeFix/ShapeFix_EdgeProjAux.cxx index 1afc7a1a69..dcc043b4e7 100644 --- a/src/ShapeFix/ShapeFix_EdgeProjAux.cxx +++ b/src/ShapeFix/ShapeFix_EdgeProjAux.cxx @@ -574,7 +574,7 @@ void ShapeFix_EdgeProjAux::UpdateParam2d (const Handle(Geom2d_Curve)& theCurve2d Standard_Real cf = theCurve2d->FirstParameter(); Standard_Real cl = theCurve2d->LastParameter(); //:S4136 Standard_Real preci = BRepAPI::Precision(); - Standard_Real preci2d = Precision::PConfusion(); //:S4136: Parametric(preci, 0.01); + constexpr Standard_Real preci2d = Precision::PConfusion(); //:S4136: Parametric(preci, 0.01); // 15.11.2002 PTV OCC966 if (ShapeAnalysis_Curve::IsPeriodic(theCurve2d)) { diff --git a/src/ShapeFix/ShapeFix_Solid.cxx b/src/ShapeFix/ShapeFix_Solid.cxx index 3536144802..3bef390593 100644 --- a/src/ShapeFix/ShapeFix_Solid.cxx +++ b/src/ShapeFix/ShapeFix_Solid.cxx @@ -548,7 +548,7 @@ TopoDS_Solid ShapeFix_Solid::SolidFromShell (const TopoDS_Shell& shell) try { OCC_CATCH_SIGNALS BRepClass3d_SolidClassifier bsc3d (solid); - Standard_Real t = Precision::Confusion(); // tolerance moyenne + constexpr Standard_Real t = Precision::Confusion(); // tolerance moyenne bsc3d.PerformInfinitePoint(t); if (bsc3d.State() == TopAbs_IN) { diff --git a/src/ShapeFix/ShapeFix_Wire_1.cxx b/src/ShapeFix/ShapeFix_Wire_1.cxx index 901cbad65d..45afce5579 100644 --- a/src/ShapeFix/ShapeFix_Wire_1.cxx +++ b/src/ShapeFix/ShapeFix_Wire_1.cxx @@ -750,7 +750,7 @@ static Standard_Real AdjustOnPeriodic2d (const Handle(Geom2d_Curve)& pc, if (Context().IsNull()) SetContext(new ShapeBuild_ReShape); - Standard_Real preci = ::Precision::PConfusion(); + constexpr Standard_Real preci = ::Precision::PConfusion(); //Standard_Real preci = Precision(); //GeomAdaptor_Surface& SA = Analyzer().Surface()->Adaptor()->ChangeSurface(); //preci = Max(SA.UResolution(preci), SA.VResolution(preci)); @@ -1024,7 +1024,7 @@ static Standard_Real AdjustOnPeriodic2d (const Handle(Geom2d_Curve)& pc, Standard_Real ipar1 = clast1, ipar2 = cfirst2; Geom2dInt_GInter Inter; - Standard_Real tolint = ::Precision::PConfusion(); + constexpr Standard_Real tolint = ::Precision::PConfusion(); Geom2dAdaptor_Curve AC1(pc1), AC2(pc2); diff --git a/src/ShapeFix/ShapeFix_Wireframe.cxx b/src/ShapeFix/ShapeFix_Wireframe.cxx index 092d54246b..b6c8a218f3 100644 --- a/src/ShapeFix/ShapeFix_Wireframe.cxx +++ b/src/ShapeFix/ShapeFix_Wireframe.cxx @@ -696,7 +696,7 @@ Standard_Boolean ShapeFix_Wireframe::MergeSmallEdges(TopTools_MapOfShape& theSma C2->D1(first2,P,Vec2); if ( edge1.Orientation() == TopAbs_REVERSED ) Vec1.Reverse(); if ( edge2.Orientation() == TopAbs_REVERSED ) Vec2.Reverse(); - Standard_Real tol2 = Precision::SquareConfusion(); + constexpr Standard_Real tol2 = Precision::SquareConfusion(); if ( Vec1.SquareMagnitude() < tol2 || Vec2.SquareMagnitude() < tol2 ) Ang1 = M_PI/2.; else Ang1 = Abs(Vec1.Angle(Vec2)); @@ -1145,7 +1145,7 @@ Standard_Boolean ShapeFix_Wireframe::MergeSmallEdges(TopTools_MapOfShape& theSma C2->D1(first2,P,Vec2); if ( edge1.Orientation() == TopAbs_REVERSED ) Vec1.Reverse(); if ( edge2.Orientation() == TopAbs_REVERSED ) Vec2.Reverse(); - Standard_Real tol2 = Precision::SquareConfusion(); + constexpr Standard_Real tol2 = Precision::SquareConfusion(); if ( Vec1.SquareMagnitude() < tol2 || Vec2.SquareMagnitude() < tol2 ) Ang1 = M_PI/2.; else Ang1 = Abs(Vec1.Angle(Vec2)); diff --git a/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve2dToBezier.cxx b/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve2dToBezier.cxx index 29a3bb64d8..c28e4d7965 100644 --- a/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve2dToBezier.cxx +++ b/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve2dToBezier.cxx @@ -61,7 +61,7 @@ void ShapeUpgrade_ConvertCurve2dToBezier::Compute() { mySegments->Clear(); mySplitParams->Clear(); - Standard_Real precision = Precision::PConfusion(); + constexpr Standard_Real precision = Precision::PConfusion(); Standard_Real First = mySplitValues->Value(1); Standard_Real Last = mySplitValues->Value(mySplitValues->Length()); @@ -232,7 +232,7 @@ void ShapeUpgrade_ConvertCurve2dToBezier::Compute() void ShapeUpgrade_ConvertCurve2dToBezier::Build(const Standard_Boolean /*Segment*/) { - Standard_Real prec = Precision::PConfusion(); + constexpr Standard_Real prec = Precision::PConfusion(); Standard_Integer nb = mySplitValues->Length(); myResultingCurves = new TColGeom2d_HArray1OfCurve (1,nb-1); Standard_Real prevPar =0.; diff --git a/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve3dToBezier.cxx b/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve3dToBezier.cxx index d7745ed114..eecadf6bab 100644 --- a/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve3dToBezier.cxx +++ b/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve3dToBezier.cxx @@ -52,7 +52,7 @@ void ShapeUpgrade_ConvertCurve3dToBezier::Compute() { mySegments->Clear(); mySplitParams->Clear(); - Standard_Real precision = Precision::PConfusion(); + constexpr Standard_Real precision = Precision::PConfusion(); Standard_Real First = mySplitValues->Value(1); Standard_Real Last = mySplitValues->Value(mySplitValues->Length()); if(myCurve->IsKind(STANDARD_TYPE(Geom_TrimmedCurve))) { @@ -193,7 +193,7 @@ void ShapeUpgrade_ConvertCurve3dToBezier::Compute() void ShapeUpgrade_ConvertCurve3dToBezier::Build(const Standard_Boolean /*Segment*/) { - Standard_Real prec = Precision::PConfusion(); + constexpr Standard_Real prec = Precision::PConfusion(); Standard_Integer nb = mySplitValues->Length(); myResultingCurves = new TColGeom_HArray1OfCurve (1,nb-1); Standard_Real prevPar = 0.; diff --git a/src/ShapeUpgrade/ShapeUpgrade_ConvertSurfaceToBezierBasis.cxx b/src/ShapeUpgrade/ShapeUpgrade_ConvertSurfaceToBezierBasis.cxx index 070f06b70a..079d73b248 100644 --- a/src/ShapeUpgrade/ShapeUpgrade_ConvertSurfaceToBezierBasis.cxx +++ b/src/ShapeUpgrade/ShapeUpgrade_ConvertSurfaceToBezierBasis.cxx @@ -72,7 +72,7 @@ void ShapeUpgrade_ConvertSurfaceToBezierBasis::Compute(const Standard_Boolean Se Standard_Real ULast = myUSplitValues->Value(myUSplitValues->Length()); Standard_Real VFirst = myVSplitValues->Value(1); Standard_Real VLast = myVSplitValues->Value(myVSplitValues->Length()); - Standard_Real precision = Precision::PConfusion(); + constexpr Standard_Real precision = Precision::PConfusion(); if (mySurface->IsKind(STANDARD_TYPE(Geom_RectangularTrimmedSurface))) { Handle(Geom_RectangularTrimmedSurface) Surface = Handle(Geom_RectangularTrimmedSurface)::DownCast(mySurface); @@ -414,7 +414,7 @@ static Handle(Geom_Surface) GetSegment(const Handle(Geom_Surface)& surf, { if(surf->IsKind(STANDARD_TYPE(Geom_BezierSurface))) { Handle(Geom_BezierSurface) bezier = Handle(Geom_BezierSurface)::DownCast(surf->Copy()); - Standard_Real prec = Precision::PConfusion(); + constexpr Standard_Real prec = Precision::PConfusion(); if(U1 < prec && U2 > 1-prec && V1 < prec && V2 > 1-prec) return bezier; //pdn K4L+ (work around) @@ -499,7 +499,7 @@ void ShapeUpgrade_ConvertSurfaceToBezierBasis::Build(const Standard_Boolean /*Se offsetValue = offSur->Offset(); } - Standard_Real prec = Precision::PConfusion(); + constexpr Standard_Real prec = Precision::PConfusion(); Handle(TColStd_HArray1OfReal) myUSplitParams = mySegments->UJointValues(); Handle(TColStd_HArray1OfReal) myVSplitParams = mySegments->VJointValues(); Standard_Integer nbU = myUSplitValues->Length(); diff --git a/src/ShapeUpgrade/ShapeUpgrade_ShapeConvertToBezier.cxx b/src/ShapeUpgrade/ShapeUpgrade_ShapeConvertToBezier.cxx index 58ef035a1c..2f4eac3cc1 100644 --- a/src/ShapeUpgrade/ShapeUpgrade_ShapeConvertToBezier.cxx +++ b/src/ShapeUpgrade/ShapeUpgrade_ShapeConvertToBezier.cxx @@ -127,7 +127,7 @@ Standard_Boolean ShapeUpgrade_ShapeConvertToBezier::Perform (const Standard_Bool BRep_Builder B; ShapeAnalysis_Edge sae; ShapeBuild_Edge sbe; - Standard_Real preci = Precision::PConfusion(); + constexpr Standard_Real preci = Precision::PConfusion(); for(TopExp_Explorer exp(myResult,TopAbs_FACE); exp.More(); exp.Next()) { TopoDS_Face face = TopoDS::Face(exp.Current()); face.Orientation(TopAbs_FORWARD); diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve.cxx b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve.cxx index a80af8aeac..b23361295a 100644 --- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve.cxx +++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve.cxx @@ -62,7 +62,7 @@ ShapeUpgrade_SplitCurve::ShapeUpgrade_SplitCurve() void ShapeUpgrade_SplitCurve::SetSplitValues (const Handle(TColStd_HSequenceOfReal)& SplitValues) { - Standard_Real precision = Precision::PConfusion(); + constexpr Standard_Real precision = Precision::PConfusion(); if(SplitValues.IsNull()) return; if(SplitValues->Length()==0) return; diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2d.cxx b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2d.cxx index e78e550aa3..57ded77523 100644 --- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2d.cxx +++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2d.cxx @@ -63,7 +63,7 @@ ShapeUpgrade_SplitCurve2d::ShapeUpgrade_SplitCurve2d() Handle(Geom2d_Curve) CopyOfC = Handle(Geom2d_Curve)::DownCast(C->Copy()); myCurve = CopyOfC; - Standard_Real precision = Precision::PConfusion(); + constexpr Standard_Real precision = Precision::PConfusion(); Standard_Real firstPar = First; Standard_Real lastPar = Last; Handle (Geom2d_Curve) aCurve = myCurve; diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2dContinuity.cxx b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2dContinuity.cxx index e58fec2990..2a2f1b9f70 100644 --- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2dContinuity.cxx +++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2dContinuity.cxx @@ -79,7 +79,7 @@ void ShapeUpgrade_SplitCurve2dContinuity::Compute() myStatus = ShapeExtend::EncodeStatus (ShapeExtend_DONE2); if (mySplitValues->Length() > 2) myStatus = ShapeExtend::EncodeStatus (ShapeExtend_DONE1); - Standard_Real precision = Precision::PConfusion(); + constexpr Standard_Real precision = Precision::PConfusion(); Standard_Real First = mySplitValues->Value(1); Standard_Real Last = mySplitValues->Value(mySplitValues->Length()); if (myCurve->IsKind(STANDARD_TYPE(Geom2d_TrimmedCurve))) { diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3d.cxx b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3d.cxx index d9e1e931cd..5ccd0b6bf8 100644 --- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3d.cxx +++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3d.cxx @@ -62,7 +62,7 @@ ShapeUpgrade_SplitCurve3d::ShapeUpgrade_SplitCurve3d() // if (ShapeUpgrade::Debug()) std::cout << "SplitCurve3d::Init"<Copy()); myCurve = CopyOfC; - Standard_Real precision = Precision::PConfusion(); + constexpr Standard_Real precision = Precision::PConfusion(); Standard_Real firstPar = First; Standard_Real lastPar = Last; Handle (Geom_Curve) aCurve = myCurve; @@ -156,7 +156,7 @@ ShapeUpgrade_SplitCurve3d::ShapeUpgrade_SplitCurve3d() // 15.11.2002 PTV OCC966 if(!ShapeAnalysis_Curve::IsPeriodic(myCurve)) { //pdn exceptons only on non periodic curves - Standard_Real precision = Precision::PConfusion(); + constexpr Standard_Real precision = Precision::PConfusion(); Standard_Real firstPar = myCurve->FirstParameter(); Standard_Real lastPar = myCurve->LastParameter(); if(Abs(First-firstPar) < precision) diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3dContinuity.cxx b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3dContinuity.cxx index ebaf87e030..e5827f2a49 100644 --- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3dContinuity.cxx +++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3dContinuity.cxx @@ -77,7 +77,7 @@ void ShapeUpgrade_SplitCurve3dContinuity::Compute() { Standard_Real First = mySplitValues->Value(1); Standard_Real Last = mySplitValues->Value(mySplitValues->Length()); - Standard_Real precision = Precision::PConfusion(); + constexpr Standard_Real precision = Precision::PConfusion(); if(myCurve->Continuity() < myCriterion) myStatus = ShapeExtend::EncodeStatus (ShapeExtend_DONE2); if (mySplitValues->Length() > 2) diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitSurface.cxx b/src/ShapeUpgrade/ShapeUpgrade_SplitSurface.cxx index 9bac8b4458..eab19a00c7 100644 --- a/src/ShapeUpgrade/ShapeUpgrade_SplitSurface.cxx +++ b/src/ShapeUpgrade/ShapeUpgrade_SplitSurface.cxx @@ -102,7 +102,7 @@ void ShapeUpgrade_SplitSurface::Init(const Handle(Geom_Surface)& S, Standard_Real U1,U2,V1,V2; mySurface->Bounds(U1,U2,V1,V2); - Standard_Real precision = Precision::PConfusion(); + constexpr Standard_Real precision = Precision::PConfusion(); if ( mySurface->IsUPeriodic() && ULast - UFirst <= U2 - U1 + precision ) { U1 = UFirst; U2 = U1 + mySurface->UPeriod(); } if ( mySurface->IsVPeriodic() && @@ -168,7 +168,7 @@ void ShapeUpgrade_SplitSurface::Init(const Handle(Geom_Surface)& S, void ShapeUpgrade_SplitSurface::SetUSplitValues(const Handle(TColStd_HSequenceOfReal)& UValues) { if(UValues.IsNull()) return; - Standard_Real precision = Precision::PConfusion(); + constexpr Standard_Real precision = Precision::PConfusion(); Standard_Real UFirst = myUSplitValues->Value(1), ULast = myUSplitValues->Value(myUSplitValues->Length()); Standard_Integer i =1; @@ -193,7 +193,7 @@ void ShapeUpgrade_SplitSurface::SetUSplitValues(const Handle(TColStd_HSequenceOf void ShapeUpgrade_SplitSurface::SetVSplitValues(const Handle(TColStd_HSequenceOfReal)& VValues) { if(VValues.IsNull()) return; - Standard_Real precision = Precision::PConfusion(); + constexpr Standard_Real precision = Precision::PConfusion(); Standard_Real VFirst = myVSplitValues->Value(1), VLast = myVSplitValues->Value(myVSplitValues->Length()); Standard_Integer i =1; diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceContinuity.cxx b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceContinuity.cxx index 494d5b2db1..a6b25f91a8 100644 --- a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceContinuity.cxx +++ b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceContinuity.cxx @@ -89,7 +89,7 @@ ShapeUpgrade_SplitSurfaceContinuity::ShapeUpgrade_SplitSurfaceContinuity() Standard_Real ULast = myUSplitValues->Value(myUSplitValues->Length()); Standard_Real VFirst = myVSplitValues->Value(1); Standard_Real VLast = myVSplitValues->Value(myVSplitValues->Length()); - Standard_Real precision = Precision::Confusion(); + constexpr Standard_Real precision = Precision::Confusion(); // if (ShapeUpgrade::Debug()) std::cout << "SplitSurfaceContinuity::Build" << std::endl; if(mySurface->Continuity() < myCriterion) myStatus = ShapeExtend::EncodeStatus (ShapeExtend_DONE2); diff --git a/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx b/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx index e17fefa111..52e8501c45 100644 --- a/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx +++ b/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx @@ -822,7 +822,7 @@ static Standard_Boolean SameSurf(const Handle(Geom_Surface)& theS1, const Handle Standard_Real uf1, ul1, vf1, vl1, uf2, ul2, vf2, vl2; theS1->Bounds(uf1, ul1, vf1, vl1); theS2->Bounds(uf2, ul2, vf2, vl2); - Standard_Real aPTol = Precision::PConfusion(); + constexpr Standard_Real aPTol = Precision::PConfusion(); if (Precision::IsNegativeInfinite(uf1)) { if (!Precision::IsNegativeInfinite(uf2)) @@ -3843,7 +3843,7 @@ void ShapeUpgrade_UnifySameDomain::UnifyEdges() } // fix changed faces and replace them in the local context - Standard_Real aPrec = Precision::Confusion(); + constexpr Standard_Real aPrec = Precision::Confusion(); for (Standard_Integer i = 1; i <= aChangedFaces.Extent(); i++) { TopoDS_Face aFace = TopoDS::Face(myContext->Apply(aChangedFaces.FindKey(i))); if (aFace.IsNull()) diff --git a/src/ShapeUpgrade/ShapeUpgrade_WireDivide.cxx b/src/ShapeUpgrade/ShapeUpgrade_WireDivide.cxx index 63600eaee9..91415b7bba 100644 --- a/src/ShapeUpgrade/ShapeUpgrade_WireDivide.cxx +++ b/src/ShapeUpgrade/ShapeUpgrade_WireDivide.cxx @@ -172,7 +172,7 @@ static void CorrectSplitValues(const Handle(TColStd_HSequenceOfReal)& orig3d, Handle(TColStd_HSequenceOfReal) new2d, Handle(TColStd_HSequenceOfReal) new3d) { - Standard_Real preci = Precision::PConfusion(); + constexpr Standard_Real preci = Precision::PConfusion(); Standard_Integer len3d = orig3d->Length(); Standard_Integer len2d = orig2d->Length(); TColStd_Array1OfBoolean fixNew2d (1, len3d); diff --git a/src/StdPrs/StdPrs_ShadedShape.cxx b/src/StdPrs/StdPrs_ShadedShape.cxx index fe2f667dba..bd807f01c9 100644 --- a/src/StdPrs/StdPrs_ShadedShape.cxx +++ b/src/StdPrs/StdPrs_ShadedShape.cxx @@ -147,7 +147,7 @@ namespace Standard_Integer aNbVertices = 0; // Precision for compare square distances - const Standard_Real aPreci = Precision::SquareConfusion(); + constexpr Standard_Real aPreci = Precision::SquareConfusion(); TopExp_Explorer aFaceIt(theShape, TopAbs_FACE); for (; aFaceIt.More(); aFaceIt.Next()) diff --git a/src/TopTrans/TopTrans_SurfaceTransition.cxx b/src/TopTrans/TopTrans_SurfaceTransition.cxx index 530e6ffd5e..9796774d8c 100644 --- a/src/TopTrans/TopTrans_SurfaceTransition.cxx +++ b/src/TopTrans/TopTrans_SurfaceTransition.cxx @@ -213,7 +213,7 @@ void TopTrans_SurfaceTransition::Reset(const gp_Dir& Tgt, { STATIC_DEFINED = Standard_True; - Standard_Real tola = Precision::Angular(); + constexpr Standard_Real tola = Precision::Angular(); Standard_Boolean curismax = (Abs(MaxD.Dot(myTgt)) < tola); Standard_Boolean curismin = (Abs(MinD.Dot(myTgt)) < tola); @@ -284,7 +284,7 @@ void TopTrans_SurfaceTransition::Compare Standard_Real Curv=0.; // ------ - Standard_Real tola = Precision::Angular(); + constexpr Standard_Real tola = Precision::Angular(); Standard_Boolean curismax = (Abs(MaxD.Dot(myTgt)) < tola); Standard_Boolean curismin = (Abs(MinD.Dot(myTgt)) < tola); if (!curismax && !curismin) { @@ -365,7 +365,7 @@ void TopTrans_SurfaceTransition::Compare // oriented Ang(beafter,dironF), // dironF normal to the curve, oriented INSIDE F, the added oriented support Standard_Real Ang = ::FUN_Ang(myNorm,beafter,myTgt,Norm,O); - Standard_Real tola = Precision::Angular(); // nyi in arg + constexpr Standard_Real tola = Precision::Angular(); // nyi in arg // i = 0,1,2 : cos = 0,>0,<0 // j = 0,1,2 : sin = 0,>0,<0 diff --git a/src/ViewerTest/ViewerTest_ObjectCommands.cxx b/src/ViewerTest/ViewerTest_ObjectCommands.cxx index a28963a606..300e5bad20 100644 --- a/src/ViewerTest/ViewerTest_ObjectCommands.cxx +++ b/src/ViewerTest/ViewerTest_ObjectCommands.cxx @@ -2928,7 +2928,7 @@ Handle( Poly_Triangulation ) CalculationOfSphere( double X , double Y , double Z Poly_Connect pc (polyTriangulation); Standard_Integer index[3]; - Standard_Real Tol = Precision::Confusion(); + constexpr Standard_Real Tol = Precision::Confusion(); gp_Dir Nor; for (i = 1; i <= polyTriangulation->NbNodes(); i++) diff --git a/src/VrmlData/VrmlData_Material.cxx b/src/VrmlData/VrmlData_Material.cxx index c3644f56fd..9014683cf7 100644 --- a/src/VrmlData/VrmlData_Material.cxx +++ b/src/VrmlData/VrmlData_Material.cxx @@ -273,7 +273,7 @@ VrmlData_ErrorStatus VrmlData_Material::Write (const char * thePrefix) const char buf[128]; Standard_Real val[3]; const Quantity_TypeOfColor bidType = Quantity_TOC_sRGB; - const Standard_Real aConf (0.001 * Precision::Confusion()); + constexpr Standard_Real aConf (0.001 * Precision::Confusion()); if (OK(aStatus) && fabs(myAmbientIntensity - 0.2) > aConf) { Sprintf (buf, "%.6g", myAmbientIntensity); @@ -324,7 +324,7 @@ VrmlData_ErrorStatus VrmlData_Material::Write (const char * thePrefix) const Standard_Boolean VrmlData_Material::IsDefault () const { - const Standard_Real aConf (0.001 * Precision::Confusion()); + constexpr Standard_Real aConf (0.001 * Precision::Confusion()); Standard_Boolean aResult (Standard_False); if (fabs(myAmbientIntensity - 0.2) < aConf && fabs(myShininess - 0.2) < aConf && diff --git a/src/VrmlData/VrmlData_ShapeConvert.cxx b/src/VrmlData/VrmlData_ShapeConvert.cxx index 6411c778de..90b00de1be 100644 --- a/src/VrmlData/VrmlData_ShapeConvert.cxx +++ b/src/VrmlData/VrmlData_ShapeConvert.cxx @@ -414,7 +414,7 @@ Handle(VrmlData_Geometry) VrmlData_ShapeConvert::triToIndexedFaceSet Poly_Connect PC(theTri); // Create the Normals node (if UV- values are available) TopLoc_Location aLoc; - const Standard_Real aConf2 = Precision::SquareConfusion(); + constexpr Standard_Real aConf2 = Precision::SquareConfusion(); const Handle(Geom_Surface) aSurface = BRep_Tool::Surface (theFace, aLoc); if (theTri->HasUVNodes() && aSurface.IsNull() == Standard_False) { diff --git a/src/gce/gce_MakeCirc.cxx b/src/gce/gce_MakeCirc.cxx index 0e7ffcda00..8f8352f133 100644 --- a/src/gce/gce_MakeCirc.cxx +++ b/src/gce/gce_MakeCirc.cxx @@ -99,7 +99,7 @@ gce_MakeCirc::gce_MakeCirc(const gp_Pnt& P1 , dir = VDir2.Crossed(Dir3); gp_Lin L2(gp_Pnt((P3.XYZ()+P2.XYZ())/2.),dir); - Standard_Real Tol = Precision::PConfusion(); + constexpr Standard_Real Tol = Precision::PConfusion(); Extrema_ExtElC distmin(L1,L2,Tol); if (!distmin.IsDone()) {