From 7a06c690fbf05b0def03a8c3632e9bb39e657a11 Mon Sep 17 00:00:00 2001 From: abv Date: Mon, 10 Dec 2012 16:53:05 +0400 Subject: [PATCH] 0023604: Uninitialized variables in debug mode Removed #ifndef DEB ... #else ... #endif directives where the variables were being initialized only in release mode. Removed unused part of code. --- src/AIS/AIS.cxx | 8 --- src/AIS/AIS_DiameterDimension.cxx | 4 -- src/BRepBlend/BRepBlend_RstRstLineBuilder.cxx | 28 ---------- .../BRepBlend_SurfRstLineBuilder.cxx | 31 ---------- src/BRepCheck/BRepCheck.cxx | 2 - src/BRepCheck/BRepCheck_Analyzer.cxx | 2 - src/BRepCheck/BRepCheck_Face.cxx | 16 ------ src/BRepCheck/BRepCheck_Wire.cxx | 8 --- src/BRepClass3d/BRepClass3d_SolidExplorer.cxx | 4 -- src/BRepFeat/BRepFeat_MakeDPrism.cxx | 4 -- src/BRepFeat/BRepFeat_MakeLinearForm.cxx | 4 -- src/BRepFeat/BRepFeat_MakePrism.cxx | 12 ---- src/BRepFill/BRepFill_Generator.cxx | 4 -- src/BRepFill/BRepFill_LocationLaw.cxx | 4 -- src/BRepFill/BRepFill_NSections.cxx | 4 -- src/BRepFill/BRepFill_Pipe.cxx | 6 -- src/BRepFill/BRepFill_TrimSurfaceTool.cxx | 4 -- src/BRepLib/BRepLib.cxx | 12 ---- src/BRepLib/BRepLib_MakeWire_1.cxx | 8 --- src/BRepOffset/BRepOffset_Inter2d.cxx | 4 -- src/BRepOffset/BRepOffset_Offset.cxx | 2 - src/BRepOffset/BRepOffset_Tool.cxx | 14 ----- src/BRepTest/BRepTest_FeatureCommands.cxx | 2 - src/BRepTest/BRepTest_FilletCommands.cxx | 2 - src/BRepTools/BRepTools_ShapeSet.cxx | 4 -- src/BiTgte/BiTgte_Blend.cxx | 4 -- src/BinTools/BinTools_ShapeSet.cxx | 4 -- src/Bisector/Bisector_BisecCC.cxx | 14 +---- src/Bisector/Bisector_BisecPC.cxx | 16 ------ src/Bisector/Bisector_Inter.cxx | 4 -- src/CDM/CDM_Document.cxx | 2 - src/ChFi3d/ChFi3d_Builder.cxx | 34 ++++------- src/ChFi3d/ChFi3d_Builder_1.cxx | 4 -- src/ChFi3d/ChFi3d_Builder_2.cxx | 20 ------- src/ChFi3d/ChFi3d_Builder_6.cxx | 28 ---------- src/ChFi3d/ChFi3d_Builder_C1.cxx | 56 +------------------ src/ChFi3d/ChFi3d_Builder_C2.cxx | 4 -- src/ChFi3d/ChFi3d_Builder_CnCrn.cxx | 24 -------- src/ChFi3d/ChFi3d_Builder_SpKP.cxx | 4 -- src/ChFi3d/ChFi3d_ChBuilder.cxx | 16 ------ src/ChFi3d/ChFi3d_FilBuilder.cxx | 20 ------- src/ChFi3d/ChFi3d_FilBuilder_C2.cxx | 15 ----- src/ChFiDS/ChFiDS_FilSpine.cxx | 4 -- src/ChFiKPart/ChFiKPart_ComputeData.cxx | 6 -- .../ChFiKPart_ComputeData_ChAsymPlnCyl.cxx | 4 -- src/DDocStd/DDocStd_DocumentCommands.cxx | 4 -- src/Draw/Draw_Display.cxx | 2 - src/DrawDim/DrawDim.cxx | 2 - src/DsgPrs/DsgPrs_AnglePresentation.cxx | 2 - src/DsgPrs/DsgPrs_LengthPresentation.cxx | 2 - src/Expr/Expr_Product.cxx | 4 -- src/Expr/Expr_Sum.cxx | 4 -- src/Extrema/Extrema_ExtPExtS.cxx | 2 - src/Extrema/Extrema_ExtPRevS.cxx | 2 - src/GeomFill/GeomFill_SnglrFunc.cxx | 8 --- .../GeomliteTest_ApproxCommands.cxx | 4 -- .../Graphic2d_HidingGraphicObject.cxx | 2 - src/IntCurve/IntCurve_IConicTool.cxx | 2 - src/IntCurve/IntCurve_PConicTool.cxx | 4 -- src/IntCurve/IntCurve_ProjectOnPConicTool.cxx | 4 -- src/IntPatch/IntPatch_LineConstructor.cxx | 4 -- src/IntPatch/IntPatch_Polyhedron.cxx | 9 --- src/IntPolyh/IntPolyh_MaillageAffinage.cxx | 4 -- src/LProp/LProp_AnalyticCurInf.cxx | 2 - src/MAT2d/MAT2d_MiniPath.cxx | 12 ---- src/MgtTopoDS/MgtTopoDS.cxx | 8 --- src/OSD/OSD_Error.cxx | 6 -- src/OSD/OSD_Path.cxx | 2 +- src/PlotMgt/PlotMgt_PlotterParameter.cxx | 2 - src/ProjLib/ProjLib_ProjectOnPlane.cxx | 4 -- src/QANewBRepNaming/QANewBRepNaming.cxx | 2 - src/Select3D/Select3D_SensitiveFace.cxx | 4 -- src/Select3D/Select3D_SensitiveTriangle.cxx | 2 - src/SelectMgr/SelectMgr_SelectionManager.cxx | 14 ----- src/TestTopOpe/TestTopOpe_BOOP.cxx | 4 -- src/TestTopOpe/TestTopOpe_EditBOOP.cxx | 2 - src/TestTopOpe/TestTopOpe_HDSCommands.cxx | 4 -- .../TestTopOpeDraw_DrawableSHA.cxx | 2 - src/TopOpeBRep/TopOpeBRep_FaceEdgeFiller.cxx | 3 - .../TopOpeBRepBuild_HBuilder.cxx | 5 -- src/TopOpeBRepBuild/TopOpeBRepBuild_ffsfs.cxx | 15 +---- 81 files changed, 17 insertions(+), 617 deletions(-) diff --git a/src/AIS/AIS.cxx b/src/AIS/AIS.cxx index 6aec31c0eb..0c7e02fa70 100755 --- a/src/AIS/AIS.cxx +++ b/src/AIS/AIS.cxx @@ -1102,11 +1102,7 @@ void AIS::ComputeLengthBetweenCurvilinearFaces( const TopoDS_Face & FirstFa { GeomAPI_ProjectPointOnSurf aProjector; Quantity_Parameter U, V; -#ifndef DEB TopAbs_State State = TopAbs_UNKNOWN; -#else - TopAbs_State State; -#endif if (AutomaticPos) { TopExp_Explorer Explo( FirstFace, TopAbs_VERTEX ); @@ -1147,11 +1143,7 @@ void AIS::ComputeLengthBetweenCurvilinearFaces( const TopoDS_Face & FirstFa DirAttach = gp_Dir( D1U ^ D1V ); aProjector.Init( FirstAttach, SecondSurf ); -#ifndef DEB Standard_Integer Index = 0; -#else - Standard_Integer Index; -#endif Quantity_Length MinDist = RealLast(); gp_Dir LocalDir; for (Standard_Integer i = 1; i <= aProjector.NbPoints(); i++) diff --git a/src/AIS/AIS_DiameterDimension.cxx b/src/AIS/AIS_DiameterDimension.cxx index d9e2fa2a6a..8d8c872ed7 100755 --- a/src/AIS/AIS_DiameterDimension.cxx +++ b/src/AIS/AIS_DiameterDimension.cxx @@ -651,11 +651,7 @@ static Standard_Boolean CircleFromPlanarFace(const TopoDS_Face& aFace, void AIS_DiameterDimension::ComputeOnePlanarFaceDiameter(const Handle(Prs3d_Presentation)& aPresentation) { gp_Pnt curPos ; -#ifndef DEB Standard_Real parfirst =0., parend =0.; -#else - Standard_Real parfirst, parend; -#endif if (myAutomaticPosition) { Handle(Geom_Curve) curv; gp_Pnt ptfirst,ptend; diff --git a/src/BRepBlend/BRepBlend_RstRstLineBuilder.cxx b/src/BRepBlend/BRepBlend_RstRstLineBuilder.cxx index 167837fbf6..2dabb2f27a 100755 --- a/src/BRepBlend/BRepBlend_RstRstLineBuilder.cxx +++ b/src/BRepBlend/BRepBlend_RstRstLineBuilder.cxx @@ -309,13 +309,8 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::PerformFirstSection Standard_Boolean recadp1, recadp2, recadrst1, recadrst2; Standard_Real wp1, wp2, wrst1, wrst2; -#ifndef DEB Blend_Status State = Blend_OnRst12; Standard_Real trst11 = 0., trst12 = 0., trst21 = 0., trst22 = 0.; -#else - Blend_Status State; - Standard_Real trst11, trst12, trst21, trst22; -#endif math_Vector infbound(1, 2), supbound(1, 2), tolerance(1, 2); math_Vector solinvp1(1, 2), solinvp2(1, 2), solinvrst1(1, 3), solinvrst2(1, 3); Handle(Adaptor3d_HVertex) Vtxp1, Vtxp2, Vtxrst1, Vtxrst2, Vtxc; @@ -555,13 +550,8 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func, if (sens* (parprec - Bound) >= -tolgui) { return; } -#ifndef DEB Blend_Status State = Blend_OnRst12; Standard_Real trst11 = 0., trst12 = 0., trst21 = 0., trst22 = 0.; -#else - Blend_Status State; - Standard_Real trst11, trst12, trst21, trst22; -#endif TopAbs_State situonc1, situonc2; Blend_DecrochStatus decroch; Standard_Boolean Arrive, recadp1, recadp2, recadrst1, recadrst2, echecrecad; @@ -996,10 +986,8 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func, Arrive = Standard_True; } break; -#ifndef DEB default: break; -#endif } if (Arrive) { if (sens > 0.) { @@ -1390,11 +1378,7 @@ void BRepBlend_RstRstLineBuilder::MakeExtremity(BRepBlend_Extremity& else { Extrem.SetVertex(Vtx); while (Iter->More()) { -//#ifndef DEB Handle(Adaptor2d_HCurve2d) arc = Iter->Value(); -//#else -// Handle(Adaptor2d_HCurve2d)& arc = Iter->Value(); -//#endif if (arc != Arc) { Iter->Initialize(arc); Iter->InitVertexIterator(); @@ -1442,11 +1426,7 @@ Blend_Status BRepBlend_RstRstLineBuilder::CheckDeflectionOnRst1(const Blend_Poin prevTg = previousP.TangentOnC1(); } Standard_Real Norme, curNorme; -#ifndef DEB Standard_Real prevNorme = 0.; -#else - Standard_Real prevNorme; -#endif gp_Vec Corde(prevP, Psurf); Norme = Corde.SquareMagnitude(); if (!curpointistangent) curNorme = Tgsurf.SquareMagnitude(); @@ -1524,11 +1504,7 @@ Blend_Status BRepBlend_RstRstLineBuilder::CheckDeflectionOnRst2(const Blend_Poin prevTg = previousP.TangentOnC2(); } Standard_Real Norme, curNorme; -#ifndef DEB Standard_Real prevNorme = 0.; -#else - Standard_Real prevNorme; -#endif gp_Vec Corde(prevP, Psurf); Norme = Corde.SquareMagnitude(); if (!curpointistangent) curNorme = Tgsurf.SquareMagnitude(); @@ -1598,11 +1574,7 @@ Blend_Status BRepBlend_RstRstLineBuilder::TestArret(Blend_RstRstFunction& Func, gp_Vec tgrst1, tgrst2; gp_Vec2d tg2drst1, tg2drst2; Blend_Status StateRst1, StateRst2; -#ifndef DEB IntSurf_TypeTrans trarst1 = IntSurf_Undecided, trarst2 = IntSurf_Undecided; -#else - IntSurf_TypeTrans trarst1, trarst2; -#endif Blend_Point curpoint; if (Func.IsSolution(sol, tolesp)) { diff --git a/src/BRepBlend/BRepBlend_SurfRstLineBuilder.cxx b/src/BRepBlend/BRepBlend_SurfRstLineBuilder.cxx index 2f527caa39..4906ae5f3b 100755 --- a/src/BRepBlend/BRepBlend_SurfRstLineBuilder.cxx +++ b/src/BRepBlend/BRepBlend_SurfRstLineBuilder.cxx @@ -340,13 +340,8 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::PerformFirstSection else { sens = -1.; } -#ifndef DEB Blend_Status State = Blend_OnRst12; Standard_Real trst = 0.; -#else - Blend_Status State; - Standard_Real trst; -#endif Standard_Boolean recadp,recadrst,recads; Standard_Real wp,wrst,ws; Standard_Real U,V; @@ -515,21 +510,13 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction& Func, if (sens*(parprec - Bound) >= -tolgui) { return; } -#ifndef DEB Blend_Status State = Blend_OnRst12; -#else - Blend_Status State; -#endif TopAbs_State situonc,situons; Standard_Boolean decroch; Standard_Boolean Arrive,recadp,recadrst,recads,echecrecad; Standard_Real wp,wrst,ws; Standard_Real U,V; -#ifndef DEB Standard_Real trst = 0.; -#else - Standard_Real trst; -#endif math_Vector infbound(1,3),supbound(1,3); math_Vector parinit(1,3),tolerance(1,3); math_Vector solinvp(1,3),solinvrst(1,4),solinvs(1,3); @@ -894,10 +881,8 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction& Func, Arrive = Standard_True; } break; -#ifndef DEB default: break; -#endif } if (Arrive) { if (sens > 0.) { @@ -1265,11 +1250,7 @@ void BRepBlend_SurfRstLineBuilder::MakeExtremity(BRepBlend_Extremity& else { Extrem.SetVertex(Vtx); while (Iter->More()) { -//#ifndef DEB Handle(Adaptor2d_HCurve2d) arc = Iter->Value(); -//#else -// Handle(Adaptor2d_HCurve2d)& arc = Iter->Value(); -//#endif if (arc != Arc) { Iter->Initialize(arc); Iter->InitVertexIterator(); @@ -1316,11 +1297,7 @@ Blend_Status BRepBlend_SurfRstLineBuilder::CheckDeflectionOnSurf(const Blend_Poi if(!prevpointistangent){ prevTg = previousP.TangentOnS(); } -#ifndef DEB Standard_Real Norme,prevNorme = 0.; -#else - Standard_Real Norme,prevNorme; -#endif gp_Vec Corde(prevP,Psurf); Norme = Corde.SquareMagnitude(); // if(!curpointistangent) curNorme = Tgsurf.SquareMagnitude(); @@ -1396,11 +1373,7 @@ Blend_Status BRepBlend_SurfRstLineBuilder::CheckDeflectionOnRst(const Blend_Poin if(!prevpointistangent){ prevTg = previousP.TangentOnC(); } -#ifndef DEB Standard_Real Norme,prevNorme = 0.; -#else - Standard_Real Norme,prevNorme; -#endif gp_Vec Corde(prevP,Psurf); Norme = Corde.SquareMagnitude(); // if(!curpointistangent) curNorme = Tgsurf.SquareMagnitude(); @@ -1470,11 +1443,7 @@ Blend_Status BRepBlend_SurfRstLineBuilder::TestArret(Blend_SurfRstFunction& Func gp_Vec tgs,tgrst; gp_Vec2d tg2ds,tg2drst; Blend_Status StateS,StateRst; -#ifndef DEB IntSurf_TypeTrans tras = IntSurf_Undecided, trarst = IntSurf_Undecided; -#else - IntSurf_TypeTrans tras,trarst; -#endif Blend_Point curpoint; if (Func.IsSolution(sol,tolesp)) { diff --git a/src/BRepCheck/BRepCheck.cxx b/src/BRepCheck/BRepCheck.cxx index a290d5ae53..1eecf255d7 100755 --- a/src/BRepCheck/BRepCheck.cxx +++ b/src/BRepCheck/BRepCheck.cxx @@ -181,10 +181,8 @@ void BRepCheck::Print(const BRepCheck_Status stat, case BRepCheck_CheckFail: OS << "BRepCheck_CheckFail\n"; break; -#ifndef DEB default: break; -#endif } } diff --git a/src/BRepCheck/BRepCheck_Analyzer.cxx b/src/BRepCheck/BRepCheck_Analyzer.cxx index c2e4d95a3a..3e13829679 100755 --- a/src/BRepCheck/BRepCheck_Analyzer.cxx +++ b/src/BRepCheck/BRepCheck_Analyzer.cxx @@ -91,10 +91,8 @@ void BRepCheck_Analyzer::Put(const TopoDS_Shape& S, case TopAbs_COMPSOLID: case TopAbs_COMPOUND: break; -#ifndef DEB default: break; -#endif } myMap.Bind(S,HR); for(TopoDS_Iterator theIterator(S);theIterator.More();theIterator.Next()) { diff --git a/src/BRepCheck/BRepCheck_Face.cxx b/src/BRepCheck/BRepCheck_Face.cxx index 970c69d02e..14a6e10e18 100755 --- a/src/BRepCheck/BRepCheck_Face.cxx +++ b/src/BRepCheck/BRepCheck_Face.cxx @@ -684,29 +684,13 @@ static Standard_Boolean IsInside(const TopoDS_Wire& wir, } gp_Pnt2d pt2d(C2d->Value(prm)); -#ifdef DEB - TopAbs_State st2= -#endif - FClass2d.Perform(pt2d,Standard_False); -//-- if(st1!=st2) { -//-- static int p=0; -//-- printf("\n point p%d %g %g \n",++p,pt2d.X(),pt2d.Y()); -//-- } if(WireBienOriente) { -#ifndef DEB return(FClass2d.Perform(pt2d,Standard_False) == TopAbs_OUT); } else { return(FClass2d.Perform(pt2d,Standard_False) == TopAbs_IN); } -#else - return(st2 == TopAbs_OUT); - } - else { - return(st2 == TopAbs_IN); - } -#endif } return Standard_False; } diff --git a/src/BRepCheck/BRepCheck_Wire.cxx b/src/BRepCheck/BRepCheck_Wire.cxx index 057959d941..6b26e1033c 100755 --- a/src/BRepCheck/BRepCheck_Wire.cxx +++ b/src/BRepCheck/BRepCheck_Wire.cxx @@ -548,11 +548,7 @@ BRepCheck_Status BRepCheck_Wire::Orientation(const TopoDS_Face& F, theOstat = BRepCheck_NoError; TopoDS_Vertex VF,VL; -#ifndef DEB TopAbs_Orientation orient, ortmp = TopAbs_FORWARD; -#else - TopAbs_Orientation orient, ortmp; -#endif TopTools_ListOfShape ledge, ListOfPassedEdge; TopExp_Explorer exp,vte; TopTools_MapOfShape mapS; @@ -1492,11 +1488,7 @@ static TopAbs_Orientation GetOrientation(const TopTools_MapOfShape& mapE, Standard_Real MinAngle, MaxAngle, angle; Standard_Real gpResolution=gp::Resolution(); TopAbs_Orientation aVOrientation, aEdgOrientation; -#ifndef DEB Standard_Real dist2d = 0, p = 0; -#else - Standard_Real dist2d, p; -#endif Standard_Real f, l, parpiv; Standard_Real tolv = BRep_Tool::Tolerance(V); BRepAdaptor_Surface Ads(F,Standard_False); // no restriction diff --git a/src/BRepClass3d/BRepClass3d_SolidExplorer.cxx b/src/BRepClass3d/BRepClass3d_SolidExplorer.cxx index b2e4cca22a..f7205a188b 100755 --- a/src/BRepClass3d/BRepClass3d_SolidExplorer.cxx +++ b/src/BRepClass3d/BRepClass3d_SolidExplorer.cxx @@ -909,12 +909,8 @@ Standard_Integer BRepClass3d_SolidExplorer::Segment(const gp_Pnt& P, IntCurvesFace_Intersector& BRepClass3d_SolidExplorer::Intersector(const TopoDS_Face& F) const { void *ptr = (void*)(myMapOfInter.Find(F)); -#ifndef DEB IntCurvesFace_Intersector& curr = (*((IntCurvesFace_Intersector *)ptr)); return curr; -#else - return(*((IntCurvesFace_Intersector *)ptr)); -#endif } //======================================================================= diff --git a/src/BRepFeat/BRepFeat_MakeDPrism.cxx b/src/BRepFeat/BRepFeat_MakeDPrism.cxx index 4568e19d60..d13d6be9e0 100755 --- a/src/BRepFeat/BRepFeat_MakeDPrism.cxx +++ b/src/BRepFeat/BRepFeat_MakeDPrism.cxx @@ -786,11 +786,7 @@ void BRepFeat_MakeDPrism::PerformFromEnd(const TopoDS_Shape& Until) LocOpe_CSIntersector ASI2(mySbase); ASI1.Perform(scur); ASI2.Perform(scur); -#ifndef DEB TopAbs_Orientation OrU = TopAbs_FORWARD, OrF = TopAbs_FORWARD; -#else - TopAbs_Orientation OrU, OrF; -#endif TopoDS_Face FUntil, FFrom; if (ASI1.IsDone() && ASI1.NbPoints(1) >=1) { OrU = ASI1.Point(1,1).Orientation(); diff --git a/src/BRepFeat/BRepFeat_MakeLinearForm.cxx b/src/BRepFeat/BRepFeat_MakeLinearForm.cxx index ebbec3acee..4c27c2fdf9 100755 --- a/src/BRepFeat/BRepFeat_MakeLinearForm.cxx +++ b/src/BRepFeat/BRepFeat_MakeLinearForm.cxx @@ -984,11 +984,7 @@ void BRepFeat_MakeLinearForm::Perform() TopExp_Explorer Ex; TopoDS_Edge eb, ec; gp_Pnt p1, p2; -#ifndef DEB Standard_Real t1 = 0., t2 = 0.; -#else - Standard_Real t1, t2; -#endif Standard_Boolean c1f, c2f, c1l, c2l; for (Ex.Init(sect.Shape(), TopAbs_EDGE); Ex.More(); Ex.Next()) { diff --git a/src/BRepFeat/BRepFeat_MakePrism.cxx b/src/BRepFeat/BRepFeat_MakePrism.cxx index c4d5a18345..1b3340c770 100755 --- a/src/BRepFeat/BRepFeat_MakePrism.cxx +++ b/src/BRepFeat/BRepFeat_MakePrism.cxx @@ -832,11 +832,7 @@ void BRepFeat_MakePrism::PerformFromEnd(const TopoDS_Shape& Until) LocOpe_CSIntersector ASI2(mySbase); ASI1.Perform(scur); ASI2.Perform(scur); -#ifndef DEB TopAbs_Orientation OrU = TopAbs_FORWARD, OrF = TopAbs_FORWARD; -#else - TopAbs_Orientation OrU, OrF; -#endif TopoDS_Face FUntil, FFrom; if (ASI1.IsDone() && ASI1.NbPoints(1) >=1) { OrU = ASI1.Point(1,1).Orientation(); @@ -1126,11 +1122,7 @@ static Standard_Real HeightMax(const TopoDS_Shape& theSbase, BRepBndLib::Add(theSbase,Box); BRepBndLib::Add(theSkface,Box); if(!theSFrom.IsNull()) { -#ifndef DEB Standard_Boolean FacRevolInfini = Standard_False; -#else - Standard_Boolean FacRevolInfini; -#endif TopExp_Explorer exp; exp.Init(theSFrom, TopAbs_EDGE); for(; exp.More(); exp.Next()) { @@ -1145,11 +1137,7 @@ static Standard_Real HeightMax(const TopoDS_Shape& theSbase, BRepBndLib::Add(theSFrom,Box); } if(!theSUntil.IsNull()) { -#ifndef DEB - Standard_Boolean FacRevolInfini = Standard_False; -#else Standard_Boolean FacRevolInfini; -#endif TopExp_Explorer exp; exp.Init(theSUntil, TopAbs_EDGE); for(; exp.More(); exp.Next()) { diff --git a/src/BRepFill/BRepFill_Generator.cxx b/src/BRepFill/BRepFill_Generator.cxx index 95cdb9e008..e660d664ff 100755 --- a/src/BRepFill/BRepFill_Generator.cxx +++ b/src/BRepFill/BRepFill_Generator.cxx @@ -91,11 +91,7 @@ Standard_Integer DetectKPart(const TopoDS_Edge& Edge1, // find the particular case gp_Pnt pos1, pos; Standard_Real dist; -#ifndef DEB Standard_Real dist1 =0.; -#else - Standard_Real dist1; -#endif gp_Ax1 axe1, axe; if (degen1) { diff --git a/src/BRepFill/BRepFill_LocationLaw.cxx b/src/BRepFill/BRepFill_LocationLaw.cxx index 735cb89972..a189a2f66b 100755 --- a/src/BRepFill/BRepFill_LocationLaw.cxx +++ b/src/BRepFill/BRepFill_LocationLaw.cxx @@ -468,11 +468,7 @@ void BRepFill_LocationLaw::CurvilinearBounds(const Standard_Integer Index, gp_Mat M1, M2, DM1, DM2; Standard_Real First, Last, EpsNul = 1.e-12; Standard_Real TolEps = SpatialTolerance; -#ifndef DEB Standard_Boolean Ok_D1 = Standard_False; -#else - Standard_Boolean Ok_D1; -#endif TopoDS_Vertex V; TopoDS_Edge E; TColgp_Array1OfPnt2d Bid1 (1,1); diff --git a/src/BRepFill/BRepFill_NSections.cxx b/src/BRepFill/BRepFill_NSections.cxx index ef739b546a..5a2a8ef9f2 100755 --- a/src/BRepFill/BRepFill_NSections.cxx +++ b/src/BRepFill/BRepFill_NSections.cxx @@ -759,11 +759,7 @@ void BRepFill_NSections::Init(const TColStd_SequenceOfReal & P, Standard_Integer jj; GeomAbs_Shape cont_jj; -#ifndef DEB GeomAbs_Shape cont = GeomAbs_C0; -#else - GeomAbs_Shape cont; -#endif for (jj=1; jj<=myShapes.Length(); jj++) { diff --git a/src/BRepFill/BRepFill_Pipe.cxx b/src/BRepFill/BRepFill_Pipe.cxx index 9605033ba2..79859789e5 100755 --- a/src/BRepFill/BRepFill_Pipe.cxx +++ b/src/BRepFill/BRepFill_Pipe.cxx @@ -458,10 +458,8 @@ TopoDS_Shape BRepFill_Pipe::MakeShape(const TopoDS_Shape& S, explode = Standard_True; break; } -#ifndef DEB default: break; -#endif } if (explode) { @@ -644,10 +642,8 @@ Standard_Integer BRepFill_Pipe::FindEdge(const TopoDS_Shape& S, case TopAbs_COMPSOLID : Standard_DomainError::Raise("BRepFill_Pipe::SOLID or COMPSOLID"); break; -#ifndef DEB default: break; -#endif } return result; @@ -712,10 +708,8 @@ Standard_Integer BRepFill_Pipe::FindVertex(const TopoDS_Shape& S, case TopAbs_COMPSOLID : Standard_DomainError::Raise("BRepFill_Pipe::SOLID or COMPSOLID"); break; -#ifndef DEB default: break; -#endif } return result; diff --git a/src/BRepFill/BRepFill_TrimSurfaceTool.cxx b/src/BRepFill/BRepFill_TrimSurfaceTool.cxx index 367028fbd6..dd62446d6b 100755 --- a/src/BRepFill/BRepFill_TrimSurfaceTool.cxx +++ b/src/BRepFill/BRepFill_TrimSurfaceTool.cxx @@ -164,11 +164,7 @@ static Standard_Real EvalPhase(const TopoDS_Edge& Edge, { gp_Pnt2d PE1,PE2,PF1,PF2; Standard_Real VDeg; -#ifndef DEB Standard_Real V = 0.; -#else - Standard_Real V; -#endif BRep_Tool::UVPoints(Edge,Face,PE1,PE2); VDeg = PE1.Y(); TopExp_Explorer Exp(Face,TopAbs_EDGE); diff --git a/src/BRepLib/BRepLib.cxx b/src/BRepLib/BRepLib.cxx index 61d41282c7..22ddf03759 100755 --- a/src/BRepLib/BRepLib.cxx +++ b/src/BRepLib/BRepLib.cxx @@ -148,11 +148,7 @@ Standard_Boolean BRepLib::CheckSameRange(const TopoDS_Edge& AnEdge, ((*((Handle(BRep_TEdge)*)&AnEdge.TShape()))->ChangeCurves()); Standard_Real first, last; -#ifndef DEB Standard_Real current_first =0., current_last =0. ; -#else - Standard_Real current_first,current_last ; -#endif Handle(BRep_GCurve) geometric_representation_ptr ; while (IsSameRange && an_Iterator.More()) { @@ -961,11 +957,7 @@ void BRepLib::SameParameter(const TopoDS_Edge& AnEdge, GeomAdaptor_Curve& GAC = HC->ChangeCurve(); Geom2dAdaptor_Curve& GAC2d = HC2d->ChangeCurve2d(); GeomAdaptor_Surface& GAS = HS->ChangeSurface(); -#ifndef DEB Standard_Real f3d =0.,l3d =0.; -#else - Standard_Real f3d,l3d; -#endif TopLoc_Location L3d; Handle(Geom_Curve) C3d; @@ -1522,11 +1514,7 @@ static Standard_Boolean tgtfaces(const TopoDS_Edge& Ed, Standard_Boolean rev1 = (F1.Orientation() == TopAbs_REVERSED); Standard_Boolean rev2 = (F2.Orientation() == TopAbs_REVERSED); Standard_Real f,l,eps, angmax = -M_PI; -#ifndef DEB Standard_Real ang =0.; -#else - Standard_Real ang; -#endif BRep_Tool::Range(E,f,l); Extrema_LocateExtPC ext; Standard_Boolean IsInitialized = Standard_False; diff --git a/src/BRepLib/BRepLib_MakeWire_1.cxx b/src/BRepLib/BRepLib_MakeWire_1.cxx index ead1553c3c..b3e9c91d4c 100755 --- a/src/BRepLib/BRepLib_MakeWire_1.cxx +++ b/src/BRepLib/BRepLib_MakeWire_1.cxx @@ -80,11 +80,7 @@ void BRepLib_MakeWire::Add(const TopTools_ListOfShape& L) rlist.Prepend(edVer); nlist.Prepend(edVer); if (!mapLocale.Contains(edVer)) { -#ifndef DEB Standard_Boolean notYetFound = Standard_True; -#else - Standard_Boolean notYetFound; -#endif Standard_Real gap=BRep_Tool::Tolerance(edVer); gp_Pnt pVer=BRep_Tool::Pnt(edVer); for (itMS.Initialize(mapLocale); itMS.More(); itMS.Next()) { @@ -135,11 +131,7 @@ void BRepLib_MakeWire::Add(const TopTools_ListOfShape& L) TopoDS_Vertex vf, vl; TopoDS_Shape theKey; Standard_Boolean usedVertex; -#ifndef DEB Standard_Boolean closedEdge = Standard_False; -#else - Standard_Boolean closedEdge; -#endif Standard_Integer vvInd, lastInd; do { if (!VL.IsNull() && lesMeres.Contains(VL)) { diff --git a/src/BRepOffset/BRepOffset_Inter2d.cxx b/src/BRepOffset/BRepOffset_Inter2d.cxx index 3f2608a6df..2183a4d1c9 100755 --- a/src/BRepOffset/BRepOffset_Inter2d.cxx +++ b/src/BRepOffset/BRepOffset_Inter2d.cxx @@ -1374,11 +1374,7 @@ static Standard_Boolean UpdateVertex(TopoDS_Vertex V, BRepAdaptor_Curve NC(NE); Standard_Real Of = OC.FirstParameter(); Standard_Real Ol = OC.LastParameter(); Standard_Real Nf = NC.FirstParameter(); Standard_Real Nl = NC.LastParameter(); -#ifndef DEB Standard_Real U = 0.; -#else - Standard_Real U; -#endif Standard_Real ParTol = Precision::PConfusion(); gp_Pnt P = BRep_Tool::Pnt(V); Standard_Boolean OK = Standard_False; diff --git a/src/BRepOffset/BRepOffset_Offset.cxx b/src/BRepOffset/BRepOffset_Offset.cxx index f97e496293..f38da21a7b 100755 --- a/src/BRepOffset/BRepOffset_Offset.cxx +++ b/src/BRepOffset/BRepOffset_Offset.cxx @@ -1532,10 +1532,8 @@ TopoDS_Shape BRepOffset_Offset::Generated(const TopoDS_Shape& Shape) const aShape.Reverse(); } break; -#ifndef DEB default: break; -#endif } return aShape; diff --git a/src/BRepOffset/BRepOffset_Tool.cxx b/src/BRepOffset/BRepOffset_Tool.cxx index c2a1918fa7..e41b1f0b67 100755 --- a/src/BRepOffset/BRepOffset_Tool.cxx +++ b/src/BRepOffset/BRepOffset_Tool.cxx @@ -492,10 +492,8 @@ static void BuildPCurves (const TopoDS_Edge& E, case GeomAbs_BSplineCurve: C2d = Proj.BSpline(); break; -#ifndef DEB default: break; -#endif } if (AS.IsUPeriodic() || AS.IsVPeriodic()) { @@ -2201,11 +2199,7 @@ static Standard_Boolean ProjectVertexOnEdge(TopoDS_Vertex& V, #endif BRep_Builder B; Standard_Real f,l; -#ifndef DEB Standard_Real U = 0.; -#else - Standard_Real U; -#endif TopLoc_Location L; Standard_Boolean found = Standard_False; @@ -2360,11 +2354,7 @@ void BRepOffset_Tool::Inter2d (const TopoDS_Face& F, return; } #endif -#ifndef DEB Standard_Real U1 = 0.,U2 = 0.; -#else - Standard_Real U1,U2; -#endif gp_Pnt2d P2d; if (itry == 1) { fl1[0] = C1->FirstParameter(); fl1[1] = C1->LastParameter(); @@ -3379,11 +3369,7 @@ static Standard_Boolean TryParameter (const TopoDS_Edge& OE, BRepAdaptor_Curve NC(NE); Standard_Real Of = OC.FirstParameter(); Standard_Real Ol = OC.LastParameter(); Standard_Real Nf = NC.FirstParameter(); Standard_Real Nl = NC.LastParameter(); -#ifndef DEB Standard_Real U = 0.; -#else - Standard_Real U; -#endif gp_Pnt P = BRep_Tool::Pnt(V); Standard_Boolean OK = Standard_False; diff --git a/src/BRepTest/BRepTest_FeatureCommands.cxx b/src/BRepTest/BRepTest_FeatureCommands.cxx index 2e57e5342d..4ef4b3ce2b 100755 --- a/src/BRepTest/BRepTest_FeatureCommands.cxx +++ b/src/BRepTest/BRepTest_FeatureCommands.cxx @@ -936,10 +936,8 @@ Standard_Integer offsetparameter(Draw_Interpretor& di, //case GeomAbs_Intersection: cout << " Intersection"; break; case GeomAbs_Arc: di << " Arc"; break; case GeomAbs_Intersection: di << " Intersection"; break; -#ifndef DEB default: break ; -#endif } //cout << endl; di << "\n"; diff --git a/src/BRepTest/BRepTest_FilletCommands.cxx b/src/BRepTest/BRepTest_FilletCommands.cxx index 65da9b3a5c..51e42e070a 100755 --- a/src/BRepTest/BRepTest_FilletCommands.cxx +++ b/src/BRepTest/BRepTest_FilletCommands.cxx @@ -102,10 +102,8 @@ static Standard_Integer contblend(Draw_Interpretor& di, Standard_Integer narg, c //cout << "C2"<FirstParameter(),curve->LastParameter()); if (Proj.NbPoints() > 0) { diff --git a/src/Bisector/Bisector_Inter.cxx b/src/Bisector/Bisector_Inter.cxx index 9c81c8afa5..1675f18353 100755 --- a/src/Bisector/Bisector_Inter.cxx +++ b/src/Bisector/Bisector_Inter.cxx @@ -329,11 +329,7 @@ void Bisector_Inter::NeighbourPerform(const Handle(Bisector_BisecCC)& Bis1, const Standard_Real Tol) { Standard_Real USol,U1,U2,Dist; -#ifndef DEB Standard_Real UMin =0.,UMax =0.; -#else - Standard_Real UMin,UMax; -#endif Standard_Real Eps = Precision::PConfusion(); gp_Pnt2d PSol; diff --git a/src/CDM/CDM_Document.cxx b/src/CDM/CDM_Document.cxx index cb29486c57..6abbac887d 100755 --- a/src/CDM/CDM_Document.cxx +++ b/src/CDM/CDM_Document.cxx @@ -914,10 +914,8 @@ void CDM_Document::Close() Standard_Failure::Raise("cannot close this document because a document " "referencing it refuses"); break; -#ifndef DEB default: break; -#endif } if(FromReferencesNumber() != 0) { CDM_ListIteratorOfListOfReferences it(myFromReferences); diff --git a/src/ChFi3d/ChFi3d_Builder.cxx b/src/ChFi3d/ChFi3d_Builder.cxx index 4ee07fadbd..473c9cb928 100755 --- a/src/ChFi3d/ChFi3d_Builder.cxx +++ b/src/ChFi3d/ChFi3d_Builder.cxx @@ -275,30 +275,28 @@ void ChFi3d_Builder::Compute() //construct fillets on each vertex + feed the Ds if (done) { - //Standard_Integer nbresult=0; -// for (Standard_Integer j=1;j<=myVDataMap.Extent();j++) { -#ifndef DEB - static -#endif //to avoid Linux warning:<< variable `j' might be clobbered by `longjmp' or `vfork' >> Standard_Integer j; - for (j=1;j<=myVDataMap.Extent();j++) { - try { + for (j=1;j<=myVDataMap.Extent();j++) + { + try + { OCC_CATCH_SIGNALS - PerformFilletOnVertex(j); + PerformFilletOnVertex(j); } - catch(Standard_Failure) { - Handle(Standard_Failure) exc = Standard_Failure::Caught(); + catch(Standard_Failure) + { + Handle(Standard_Failure) exc = Standard_Failure::Caught(); #ifdef DEB - cout <<"EXCEPTION Corner compute " << exc << endl; + cout <<"EXCEPTION Corner compute " << exc << endl; #endif - badvertices.Append(myVDataMap.FindKey(j)); + badvertices.Append(myVDataMap.FindKey(j)); hasresult=Standard_False; - done = Standard_True; + done = Standard_True; } if (!done) badvertices.Append(myVDataMap.FindKey(j)); done = Standard_True; } - if (!hasresult) done = badvertices.IsEmpty(); + if (!hasresult) done = badvertices.IsEmpty(); } @@ -575,11 +573,7 @@ void ChFi3d_Builder::PerformSingularCorner Handle(ChFiDS_SurfData) Fd; Standard_Integer i, Icurv; -#ifndef DEB Standard_Integer Ivtx = 0; -#else - Standard_Integer Ivtx; -#endif for (It.Initialize(myVDataMap(Index)), i=0; It.More(); It.Next(),i++){ stripe = It.Value(); // SurfData concerned and its CommonPoints, @@ -647,11 +641,7 @@ void ChFi3d_Builder::PerformFilletOnVertex Standard_Integer i; Standard_Boolean nondegenere = Standard_True; Standard_Boolean toujoursdegenere = Standard_True; -#ifndef DEB Standard_Boolean isfirst = Standard_False; -#else - Standard_Boolean isfirst; -#endif for (It.Initialize(myVDataMap(Index)), i=0; It.More(); It.Next(),i++){ stripe = It.Value(); sp = stripe->Spine(); diff --git a/src/ChFi3d/ChFi3d_Builder_1.cxx b/src/ChFi3d/ChFi3d_Builder_1.cxx index b9a0549571..6aebf22f09 100755 --- a/src/ChFi3d/ChFi3d_Builder_1.cxx +++ b/src/ChFi3d/ChFi3d_Builder_1.cxx @@ -658,11 +658,7 @@ Standard_Boolean ChFi3d_Builder::PerformElement(const Handle(ChFiDS_Spine)& Spin Standard_Boolean Fini = Standard_False; Standard_Integer Nb; -#ifndef DEB ChFiDS_State CurSt = ChFiDS_Closed; -#else - ChFiDS_State CurSt; -#endif if (VStart.IsSame(LVEc)) {//case if only one edge is closed CEc.Initialize(Ec); Wl = BRep_Tool::Parameter(VStart,Ec); diff --git a/src/ChFi3d/ChFi3d_Builder_2.cxx b/src/ChFi3d/ChFi3d_Builder_2.cxx index f516fa1060..f807c2d9f3 100755 --- a/src/ChFi3d/ChFi3d_Builder_2.cxx +++ b/src/ChFi3d/ChFi3d_Builder_2.cxx @@ -471,11 +471,7 @@ Standard_Boolean IsG1(const ChFiDS_Map& TheMap, // in which case FVoi = FRef is returned (less frequent case). TopExp_Explorer Ex; Standard_Boolean orset = Standard_False; -#ifndef DEB TopAbs_Orientation orient = TopAbs_FORWARD ; -#else - TopAbs_Orientation orient; -#endif TopoDS_Edge ed; for(Ex.Init(FRef,TopAbs_EDGE); Ex.More(); Ex.Next()){ ed = TopoDS::Edge(Ex.Current()); @@ -810,11 +806,7 @@ void ChFi3d_Builder::StartSol(const Handle(ChFiDS_Stripe)& Stripe, Standard_Real wl = 0.9973 * Spine->LastParameter(nbed) + 0.0027 * Spine->FirstParameter(nbed); -#ifndef DEB Standard_Real TolE = 1.0e-7; -#else - Standard_Real TolE; -#endif BRepAdaptor_Surface AS; Standard_Integer nbessai; @@ -825,11 +817,7 @@ void ChFi3d_Builder::StartSol(const Handle(ChFiDS_Stripe)& Stripe, TopoDS_Edge cured; TopoDS_Face f1,f2; TopAbs_Orientation Or1,Or2; -#ifndef DEB Standard_Integer Choix = 0; -#else - Standard_Integer Choix; -#endif math_Vector SolDep(1,4); Handle(Geom2d_Curve) PC; Extrema_ExtPC PExt; @@ -2006,11 +1994,7 @@ void ChFi3d_Builder::PerformSetOfSurfOnElSpine } } Standard_Real MaxStep = (bidl-bidf)*0.05/nbed; -#ifndef DEB Standard_Real Firstsov = 0.; -#else - Standard_Real Firstsov; -#endif Standard_Boolean intf = 0, intl = 0; while(!fini){ // are these the ends (no extension on periodic). @@ -2931,11 +2915,7 @@ void ChFi3d_Builder::PerformSetOfKGen(Handle(ChFiDS_Stripe)& Stripe, Standard_Real fp = cursd->FirstSpineParam(); Standard_Real lp = cursd->LastSpineParam(); Standard_Integer j; -#ifndef DEB Standard_Integer jf = 0, jl = 0; -#else - Standard_Integer jf,jl; -#endif if(lp < WF+tolesp || fp > WL-tolesp) continue; for(j = IF; j < IL; j++){ jf = j; diff --git a/src/ChFi3d/ChFi3d_Builder_6.cxx b/src/ChFi3d/ChFi3d_Builder_6.cxx index 880a88a996..50a9233720 100755 --- a/src/ChFi3d/ChFi3d_Builder_6.cxx +++ b/src/ChFi3d/ChFi3d_Builder_6.cxx @@ -656,11 +656,7 @@ Standard_Boolean ChFi3d_Builder::StoreData(Handle(ChFiDS_SurfData)& Data, if(checkcurve.IsNull()) checkcurve = new GeomAdaptor_HCurve(); GeomAdaptor_Curve& chc = checkcurve->ChangeCurve(); Standard_Real tolget3d, tolget2d, tolaux, tolC1, tolcheck; -#ifndef DEB Standard_Real tolC2 = 0.; -#else - Standard_Real tolC2; -#endif approx.TolReached(tolget3d, tolget2d); tolaux = approx.TolCurveOnSurf(1); tolC1 = tolget3d + tolaux; @@ -959,11 +955,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData Standard_Real MS = MaxStep; Standard_Integer again = 0; Standard_Integer nbptmin = 3; //jlr -#ifndef DEB Standard_Integer Nbpnt = 0; -#else - Standard_Integer Nbpnt; -#endif // the initial solution is reframed if necessary. math_Vector ParSol(1,3); Standard_Real NewFirst = PFirst; @@ -1095,11 +1087,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData Standard_Real MS = MaxStep; Standard_Integer again = 0; Standard_Integer nbptmin = 3; //jlr -#ifndef DEB Standard_Integer Nbpnt = 0; -#else - Standard_Integer Nbpnt; -#endif // the initial solution is reframed if necessary. math_Vector ParSol(1,2); Standard_Real NewFirst = PFirst; @@ -1229,11 +1217,7 @@ Standard_Boolean ChFi3d_Builder::SimulData Standard_Real MS = MaxStep; Standard_Integer again = 0; -#ifndef DEB Standard_Integer Nbpnt = 0; -#else - Standard_Integer Nbpnt; -#endif // the starting solution is reframed if needed. math_Vector ParSol(1,3); Standard_Real NewFirst = PFirst; @@ -1359,11 +1343,7 @@ Standard_Boolean ChFi3d_Builder::SimulData Standard_Real MS = MaxStep; Standard_Integer again = 0; -#ifndef DEB Standard_Integer Nbpnt = 0; -#else - Standard_Integer Nbpnt; -#endif // The initial solution is reframed if necessary. math_Vector ParSol(1,2); Standard_Real NewFirst = PFirst; @@ -1581,11 +1561,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData //******************************************************************// Standard_Integer again = 0; Standard_Boolean tchernobyl = 0; -#ifndef DEB Standard_Real u1sov = 0., u2sov = 0.; -#else - Standard_Real u1sov, u2sov; -#endif TopoDS_Face bif; //Max step is relevant, but too great, the vector is required to detect //the twists. @@ -2110,11 +2086,7 @@ Standard_Boolean ChFi3d_Builder::SimulData } Standard_Real Targetsov = Target; -#ifndef DEB Standard_Real u1sov = 0., u2sov = 0.; -#else - Standard_Real u1sov, u2sov; -#endif // on recadre la solution de depart a la demande. math_Vector ParSol(1,4); Standard_Real NewFirst = PFirst; diff --git a/src/ChFi3d/ChFi3d_Builder_C1.cxx b/src/ChFi3d/ChFi3d_Builder_C1.cxx index a5431828c5..18e7db28d1 100755 --- a/src/ChFi3d/ChFi3d_Builder_C1.cxx +++ b/src/ChFi3d/ChFi3d_Builder_C1.cxx @@ -235,11 +235,9 @@ static Standard_Boolean Update(Handle(Adaptor3d_HSurface)& fb, //are already in place at this stage. //Modif lvt : the periodic cases are reframed, espercially if nothing was found. Standard_Real w,uf = ct->FirstParameter(),ul = ct->LastParameter(); -#ifndef DEB + Standard_Real wbis = 0.; -#else - Standard_Real wbis; -#endif + Standard_Boolean isperiodic = ct->IsPeriodic(),recadrebis = Standard_False; Intersection.Perform(ct,fb); if (Intersection.IsDone()) { @@ -628,11 +626,7 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index, TopoDS_Edge Arcpiv,Arcprol,Arcspine; if (isfirst) Arcspine = spine->Edges(1); else Arcspine = spine->Edges(spine->NbEdges()); -#ifndef DEB TopAbs_Orientation OArcprolv = TopAbs_FORWARD, OArcprolop = TopAbs_FORWARD; -#else - TopAbs_Orientation OArcprolv,OArcprolop; -#endif Standard_Integer ICurve; Handle(BRepAdaptor_HSurface) HBs = new BRepAdaptor_HSurface(); Handle(BRepAdaptor_HSurface) HBad = new BRepAdaptor_HSurface(); @@ -643,11 +637,7 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index, Handle(Geom_Curve) Cc; Handle(Geom2d_Curve) Pc,Ps; Standard_Real Ubid,Vbid;//,mu,Mu,mv,Mv; -#ifndef DEB Standard_Real Udeb = 0.,Ufin = 0.; -#else - Standard_Real Udeb,Ufin; -#endif // gp_Pnt2d UVf1,UVl1,UVf2,UVl2; // Standard_Real Du,Dv,Step; Standard_Boolean inters = Standard_True; @@ -830,13 +820,8 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index, TopoDS_Edge edgecouture; Standard_Boolean couture,intcouture=Standard_False;; Standard_Real tolreached; -#ifndef DEB Standard_Real par1 =0.,par2 =0.; Standard_Integer indpt = 0,Icurv1 = 0,Icurv2 = 0; -#else - Standard_Real par1,par2; - Standard_Integer indpt,Icurv1,Icurv2; -#endif Handle(Geom_TrimmedCurve) curv1,curv2; Handle(Geom2d_Curve) c2d1,c2d2; @@ -940,11 +925,7 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index, Standard_NotImplemented::Raise("OneCorner : bouchon non ecrit"); } Standard_Integer IShape = DStr.AddShape(Fv); -#ifndef DEB TopAbs_Orientation Et = TopAbs_FORWARD; -#else - TopAbs_Orientation Et; -#endif if (IFadArc == 1) { TopExp_Explorer Exp; for (Exp.Init(Fv.Oriented(TopAbs_FORWARD), @@ -1245,11 +1226,7 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index, // First of all the ponts are cut with the edge of the spine. Standard_Integer IArcspine = DStr.AddShape(Arcspine); Standard_Integer IVtx = DStr.AddShape(Vtx); -#ifndef DEB TopAbs_Orientation OVtx = TopAbs_FORWARD; -#else - TopAbs_Orientation OVtx; -#endif for(ex.Init(Arcspine.Oriented(TopAbs_FORWARD),TopAbs_VERTEX); ex.More(); ex.Next()) { if (Vtx.IsSame(ex.Current())) { @@ -1754,11 +1731,7 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index) // gp_Pnt2d p2d; Standard_Real dist; Standard_Integer Ishape1=Fd->IndexOfS1(); -#ifndef DEB TopAbs_Orientation trafil1 = TopAbs_FORWARD; -#else - TopAbs_Orientation trafil1; -#endif if (Ishape1 != 0) { if (Ishape1 > 0) { trafil1 = DStr.Shape(Ishape1).Orientation(); @@ -2588,11 +2561,7 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index) // storage for the face ////////////////////////////////////////////////////////////////////// -#ifndef DEB TopAbs_Orientation ori = TopAbs_FORWARD; -#else - TopAbs_Orientation ori; -#endif orface=Face[nb-1].Orientation(); if (orface==orsurfdata ) orien = TopAbs::Reverse(orcourbe); else orien = orcourbe ; @@ -3827,11 +3796,7 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index) if(isfirst) Arcspine = spine->Edges(1); else Arcspine = spine->Edges(spine->NbEdges()); TopAbs_Orientation OArcprolbis; -#ifndef DEB TopAbs_Orientation OArcprolv = TopAbs_FORWARD, OArcprolop = TopAbs_FORWARD; -#else - TopAbs_Orientation OArcprolv, OArcprolop; -#endif Standard_Integer ICurve; Handle(BRepAdaptor_HSurface) HBs = new BRepAdaptor_HSurface(); Handle(BRepAdaptor_HSurface) HBad = new BRepAdaptor_HSurface(); @@ -3842,11 +3807,7 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index) Handle(Geom_Curve) Cc; Handle(Geom2d_Curve) Pc,Ps; Standard_Real Ubid,Vbid;//,mu,Mu,mv,Mv; -#ifndef DEB Standard_Real Udeb = 0.,Ufin = 0.; -#else - Standard_Real Udeb,Ufin; -#endif //gp_Pnt2d UVf1,UVl1,UVf2,UVl2; //Standard_Real Du,Dv,Step; Standard_Boolean inters = Standard_True; @@ -4023,13 +3984,8 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index) TopoDS_Edge edgecouture; Standard_Boolean couture,intcouture=Standard_False;; Standard_Real tolreached; -#ifndef DEB Standard_Real par1 = 0.,par2 = 0.; Standard_Integer indpt =0,Icurv1 =0,Icurv2 =0; -#else - Standard_Real par1,par2; - Standard_Integer indpt,Icurv1,Icurv2; -#endif Handle(Geom_TrimmedCurve) curv1,curv2; Handle(Geom2d_Curve) c2d1,c2d2; @@ -4132,11 +4088,7 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index) Standard_NotImplemented::Raise("OneCorner : cap not written"); } Standard_Integer IShape = DStr.AddShape(Fv); -#ifndef DEB TopAbs_Orientation Et = TopAbs_FORWARD; -#else - TopAbs_Orientation Et; -#endif if(IFadArc == 1){ TopExp_Explorer Exp; for (Exp.Init(Fv.Oriented(TopAbs_FORWARD), @@ -4252,11 +4204,7 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index) Standard_Integer IArcspine = DStr.AddShape(Arcspine); Standard_Integer IVtx = DStr.AddShape(Vtx); TopAbs_Orientation OVtx2; -#ifndef DEB TopAbs_Orientation OVtx = TopAbs_FORWARD; -#else - TopAbs_Orientation OVtx; -#endif for(ex.Init(Arcspine.Oriented(TopAbs_FORWARD),TopAbs_VERTEX); ex.More(); ex.Next()){ if(Vtx.IsSame(ex.Current())) { diff --git a/src/ChFi3d/ChFi3d_Builder_C2.cxx b/src/ChFi3d/ChFi3d_Builder_C2.cxx index c16e238d4d..9bdbd459df 100755 --- a/src/ChFi3d/ChFi3d_Builder_C2.cxx +++ b/src/ChFi3d/ChFi3d_Builder_C2.cxx @@ -402,11 +402,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer // on the opposing face with the surface of the big, // and finally intersect the big with the face at end // between this point and the point on arc. -#ifndef DEB Standard_Boolean parcrois = Standard_False ; -#else - Standard_Boolean parcrois; -#endif TopExp_Explorer Expl; for(Expl.Init(pivot.Oriented(TopAbs_FORWARD),TopAbs_VERTEX); Expl.More(); Expl.Next()){ diff --git a/src/ChFi3d/ChFi3d_Builder_CnCrn.cxx b/src/ChFi3d/ChFi3d_Builder_CnCrn.cxx index 0474154c08..a736a10ce0 100755 --- a/src/ChFi3d/ChFi3d_Builder_CnCrn.cxx +++ b/src/ChFi3d/ChFi3d_Builder_CnCrn.cxx @@ -483,11 +483,7 @@ static void CalculBatten (const Handle (GeomAdaptor_HSurface) ASurf, Handle (Geom2d_Curve)& pcurve) { Standard_Boolean isplane; -#ifndef DEB Standard_Boolean anglebig = Standard_False; -#else - Standard_Boolean anglebig; -#endif isplane=ASurf->GetType()==GeomAbs_Plane; gp_Dir2d dir1 (xdir, ydir); Geom2dLProp_CLProps2d CL1(curv2d1, picicplus, 1, 1.e-4); @@ -609,11 +605,7 @@ static void OrientationAreteViveConsecutive (const TopoDS_Shape & Fviveicicplus, TopAbs_Orientation & orien) { // orinterf is orientation of edge ic corresponding to face Fviveicicplus taken FORWARD -#ifndef DEB TopAbs_Orientation orinterf = TopAbs_FORWARD; -#else - TopAbs_Orientation orinterf; -#endif TopoDS_Face F=TopoDS::Face( Fviveicicplus); TopoDS_Edge E=TopoDS::Edge( Eviveic); TopExp_Explorer ex; @@ -1832,11 +1824,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex, // between edges (or stripes ) icmoins and indfin. // Then this courbe3d is projected on all faces (nbface) that // separate icmoins and indfin -#ifndef DEB Standard_Integer nbface = 0; -#else - Standard_Integer nbface; -#endif Standard_Real error; TColGeom2d_Array1OfCurve proj2d1(0,size); TColGeom2d_Array1OfCurve proj2d2(0,size); @@ -1997,11 +1985,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex, Standard_Boolean intersection=Standard_False, introuve; if (nconges==2 && !deuxconges) { gp_Pnt P1,P2,P3,P4; -#ifndef DEB Standard_Integer ic1 = 0,ic2 = 0; -#else - Standard_Integer ic1,ic2; -#endif trouve=Standard_False; for (ic=0;icSpine()->Edges(nbedge); Standard_Integer IArcspine = DStr.AddShape(Arcspine); -#ifndef DEB TopAbs_Orientation OVtx = TopAbs_FORWARD; -#else - TopAbs_Orientation OVtx; -#endif for(ex.Init(Arcspine.Oriented(TopAbs_FORWARD),TopAbs_VERTEX); ex.More(); ex.Next()){ if(V1.IsSame(ex.Current())) { @@ -2742,11 +2722,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex, // the curves from ic to icplus the pcurves of Plate // all have the same orientation Standard_Integer Ishape1,Ishape2; -#ifndef DEB TopAbs_Orientation trafil1 = TopAbs_FORWARD, trafil2 = TopAbs_FORWARD; -#else - TopAbs_Orientation trafil1,trafil2; -#endif Ishape1 = Fd->IndexOfS1(); Ishape2 = Fd->IndexOfS2(); const ChFiDS_FaceInterference& Fi1 = Fd->InterferenceOnS1(); diff --git a/src/ChFi3d/ChFi3d_Builder_SpKP.cxx b/src/ChFi3d/ChFi3d_Builder_SpKP.cxx index 93dddf5e7d..2a6960bdc9 100755 --- a/src/ChFi3d/ChFi3d_Builder_SpKP.cxx +++ b/src/ChFi3d/ChFi3d_Builder_SpKP.cxx @@ -660,11 +660,7 @@ Standard_Boolean ChFi3d_Builder::SplitKPart Standard_Real pitol = Precision::PIntersection(); ChFiKPart_RstMap M1, M2; -#ifndef DEB Standard_Integer iH1 = 0,iH2 = 0; -#else - Standard_Integer iH1,iH2; -#endif Standard_Integer Nb1 = 1,Nb2 = 1; // Cutting of tangency lines (hatching). diff --git a/src/ChFi3d/ChFi3d_ChBuilder.cxx b/src/ChFi3d/ChFi3d_ChBuilder.cxx index 8e958d8435..38de95ae6d 100755 --- a/src/ChFi3d/ChFi3d_ChBuilder.cxx +++ b/src/ChFi3d/ChFi3d_ChBuilder.cxx @@ -761,11 +761,7 @@ void ChFi3d_ChBuilder::SimulKPart(const Handle(ChFiDS_SurfData)& SD ) const Standard_Real ang = (u2-u1); gp_Cone Co = AS.Cone(); Standard_Real rad = Co.RefRadius(), sang = Co.SemiAngle(); -//#ifndef DEB Standard_Integer n = (Standard_Integer) (36.*ang/M_PI + 1); -//#else -// Standard_Integer n = 36.*ang/M_PI + 1; -//#endif if(n<2) n = 2; sec = new ChFiDS_SecHArray1(1, n); for (Standard_Integer i = 1; i <= n; i++) { @@ -1904,11 +1900,7 @@ void ChFi3d_ChBuilder::ExtentOneCorner(const TopoDS_Vertex& V, void ChFi3d_ChBuilder::ExtentTwoCorner(const TopoDS_Vertex& V, const ChFiDS_ListOfStripe& LS) { -#ifndef DEB Standard_Integer Sens = 0; -#else - Standard_Integer Sens; -#endif ChFiDS_ListIteratorOfListOfStripe itel(LS); Standard_Boolean FF = Standard_True; Standard_Boolean isfirst[2]; @@ -2030,11 +2022,7 @@ void ChFi3d_ChBuilder::ExtentTwoCorner(const TopoDS_Vertex& V, void ChFi3d_ChBuilder::ExtentThreeCorner(const TopoDS_Vertex& V, const ChFiDS_ListOfStripe& LS) { -#ifndef DEB Standard_Integer Sens = 0; -#else - Standard_Integer Sens; -#endif ChFiDS_ListOfStripe check; Standard_Boolean isfirst[3]; Standard_Integer Iedge[3]; @@ -2239,11 +2227,7 @@ void ChFi3d_ChBuilder::ConexFaces (const Handle(ChFiDS_Spine)& Spine, Standard_Integer ChFi3d_ChBuilder::FindChoiceDistAngle(const Standard_Integer Choice, const Standard_Boolean DisOnF1) const { -#ifndef DEB Standard_Integer ch = 0; -#else - Standard_Integer ch; -#endif if (!DisOnF1) { switch (Choice) { diff --git a/src/ChFi3d/ChFi3d_FilBuilder.cxx b/src/ChFi3d/ChFi3d_FilBuilder.cxx index 16575c407a..9895d7940f 100755 --- a/src/ChFi3d/ChFi3d_FilBuilder.cxx +++ b/src/ChFi3d/ChFi3d_FilBuilder.cxx @@ -171,11 +171,7 @@ void ChFi3d_FilBuilder::SetFilletShape(const ChFi3d_FilletShape FShape) ChFi3d_FilletShape ChFi3d_FilBuilder::GetFilletShape() const { -#ifndef DEB ChFi3d_FilletShape filshape = ChFi3d_Rational; // need to set default value -#else - ChFi3d_FilletShape filshape; -#endif switch (myShape) { case BlendFunc_Rational: filshape= ChFi3d_Rational; @@ -557,11 +553,7 @@ void ChFi3d_FilBuilder::SimulKPart(const Handle(ChFiDS_SurfData)& SD) const Standard_Real ang = (u2-u1); gp_Torus To = AS.Torus(); Standard_Real majr = To.MajorRadius(), minr = To.MinorRadius(); -//#ifndef DEB Standard_Integer n = (Standard_Integer) (36.*ang/M_PI + 1); -//#else -// Standard_Integer n = 36.*ang/M_PI + 1; -//#endif if(n<2) n = 2; sec = new ChFiDS_SecHArray1(1, n); for (Standard_Integer i = 1; i <= n; i++) { @@ -580,11 +572,7 @@ void ChFi3d_FilBuilder::SimulKPart(const Handle(ChFiDS_SurfData)& SD) const Standard_Real ang = (u2-u1); gp_Sphere Sp = AS.Sphere(); Standard_Real rad = Sp.Radius(); -//#ifndef DEB Standard_Integer n = (Standard_Integer) (36.*ang/M_PI + 1); -//#else -// Standard_Integer n = 36.*ang/M_PI + 1; -//#endif if(n<2) n = 2; sec = new ChFiDS_SecHArray1(1, n); for (Standard_Integer i = 1; i <= n; i++) { @@ -1863,11 +1851,7 @@ void ChFi3d_FilBuilder::ExtentOneCorner(const TopoDS_Vertex& V, { // review by using the data at end of fillets (point, radius, normal // to the faces and tangents of the guideline). -#ifndef DEB Standard_Integer Sens = 0; -#else - Standard_Integer Sens; -#endif Standard_Real Coeff = 0.5; Handle(ChFiDS_Spine) Spine = S->Spine(); ChFi3d_IndexOfSurfData(V,S,Sens); @@ -1961,11 +1945,7 @@ void ChFi3d_FilBuilder::ExtentThreeCorner(const TopoDS_Vertex& V, { // Review by using the data at end of fillets (point, radius, normal // to faces and tangents to the guideline. -#ifndef DEB Standard_Integer Sens = 0; -#else - Standard_Integer Sens; -#endif Standard_Real Coeff = 0.1; ChFiDS_ListOfStripe check; // Standard_Boolean FF = Standard_True; diff --git a/src/ChFi3d/ChFi3d_FilBuilder_C2.cxx b/src/ChFi3d/ChFi3d_FilBuilder_C2.cxx index bcdecf1c6e..d9b72d27f4 100755 --- a/src/ChFi3d/ChFi3d_FilBuilder_C2.cxx +++ b/src/ChFi3d/ChFi3d_FilBuilder_C2.cxx @@ -346,13 +346,8 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index) yapiv = (pivot.IsSame(CP2.Arc())); } Handle(BRepAdaptor_HCurve) Hpivot; -#ifndef DEB Standard_Boolean sameparam = Standard_False; Standard_Real parCP1 = 0., parCP2 = 0.; -#else - Standard_Boolean sameparam; - Standard_Real parCP1, parCP2; -#endif if(yapiv) { Hpivot = new BRepAdaptor_HCurve(pivot); parCP1 = CP1.ParameterOnArc(); @@ -372,11 +367,7 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index) BRFaCo.Initialize(FaCo); TopoDS_Face FF1,FF2,F,FaPiv; -#ifndef DEB TopAbs_Orientation pctrans = TopAbs_FORWARD ; -#else - TopAbs_Orientation pctrans; -#endif Handle(Geom2d_BSplineCurve) PCurveOnPiv; FF1 = TopoDS::Face(DStr.Shape(sd1->Index(IFaArc1))); FF2 = TopoDS::Face(DStr.Shape(sd2->Index(IFaArc2))); @@ -728,15 +719,9 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index) } Handle(ChFiDS_Stripe) stsam, stdif; Handle(ChFiDS_SurfData) sdsam, sddif; -#ifndef DEB Standard_Real uintpcsam = 0., uintpcdif = 0.; Standard_Integer ifacosam = 0, ifacodif = 0, ifaopsam = 0, ifaopdif = 0; Standard_Boolean isfirstsam = Standard_False, isfirstdif = Standard_False; -#else - Standard_Real uintpcsam, uintpcdif; - Standard_Integer ifacosam, ifacodif, ifaopsam, ifaopdif; - Standard_Boolean isfirstsam, isfirstdif; -#endif if(Stat1 == ChFiDS_OnSame && Stat2 == ChFiDS_OnDiff){ stsam = st1; sdsam = sd1; uintpcsam = UIntPC1; ifacosam = IFaCo1; ifaopsam = IFaArc1; isfirstsam = isfirst1; diff --git a/src/ChFiDS/ChFiDS_FilSpine.cxx b/src/ChFiDS/ChFiDS_FilSpine.cxx index 380194d294..25d35de664 100755 --- a/src/ChFiDS/ChFiDS_FilSpine.cxx +++ b/src/ChFiDS/ChFiDS_FilSpine.cxx @@ -503,11 +503,7 @@ Handle(Law_Composite) ChFiDS_FilSpine::ComputeLaw Handle(Law_Composite) loi = new Law_Composite(); Law_Laws& list = loi->ChangeLaws(); -#ifndef DEB Standard_Real Rdeb = 0., Rfin = 0., Rcur; -#else - Standard_Real Rdeb, Rfin, Rcur; -#endif Standard_Integer icur = 1; Handle(Law_S) sl; Handle(Law_Constant) lastloi; diff --git a/src/ChFiKPart/ChFiKPart_ComputeData.cxx b/src/ChFiKPart/ChFiKPart_ComputeData.cxx index 03e24ed5ea..287916c7a7 100755 --- a/src/ChFiKPart/ChFiKPart_ComputeData.cxx +++ b/src/ChFiKPart/ChFiKPart_ComputeData.cxx @@ -107,10 +107,8 @@ static Standard_Real ComputeAbscissa(const BRepAdaptor_Curve& C, return UFirst - fp; case GeomAbs_Circle: return C.Circle().Radius()*(UFirst-fp); -#ifndef DEB default: break; -#endif } Standard_NotImplemented::Raise("calcul abscisse not processed"); return 0.; @@ -135,11 +133,7 @@ static Standard_Real ComputeAbscissa(const BRepAdaptor_Curve& C, Handle(ChFiDS_FilSpine) Spine = Handle(ChFiDS_FilSpine)::DownCast(Sp); Handle(ChFiDS_ChamfSpine) CSpine = Handle(ChFiDS_ChamfSpine)::DownCast(Sp); -#ifndef DEB Standard_Boolean surfok = Standard_False; -#else - Standard_Boolean surfok; -#endif GeomAbs_SurfaceType typ1 = S1->GetType(); GeomAbs_SurfaceType typ2 = S2->GetType(); GeomAbs_CurveType ctyp; diff --git a/src/ChFiKPart/ChFiKPart_ComputeData_ChAsymPlnCyl.cxx b/src/ChFiKPart/ChFiKPart_ComputeData_ChAsymPlnCyl.cxx index 63e4c626ea..f7f69273ac 100755 --- a/src/ChFiKPart/ChFiKPart_ComputeData_ChAsymPlnCyl.cxx +++ b/src/ChFiKPart/ChFiKPart_ComputeData_ChAsymPlnCyl.cxx @@ -392,11 +392,7 @@ Standard_Boolean ChFiKPart_MakeChAsym(TopOpeBRepDS_DataStructure& DStr, gp_Vec DirSOrC = VecTranslCyl.Normalized(); Standard_Real cosA1 = DirSOrC.Dot(VecTranslPln.Normalized()); Standard_Real sinA1 = Sqrt(1. - cosA1 * cosA1); -#ifndef DEB Standard_Real dis1 = 0.; -#else - Standard_Real dis1; -#endif Standard_Real dis2, ray = Cyl.Radius(); Standard_Boolean IsDisOnP = ( (plandab && DisOnP) || (!plandab && !DisOnP) ); diff --git a/src/DDocStd/DDocStd_DocumentCommands.cxx b/src/DDocStd/DDocStd_DocumentCommands.cxx index 2040d5be1a..e45f99edec 100755 --- a/src/DDocStd/DDocStd_DocumentCommands.cxx +++ b/src/DDocStd/DDocStd_DocumentCommands.cxx @@ -323,11 +323,7 @@ static Standard_Integer DDocStd_DumpDocument (Draw_Interpretor& di, // command di << "COMMAND : "; if (D->HasOpenCommand()) di << " Is Open"; -#ifndef DEB else di << " Is Not Open"; -#else - else " Is Not Open"; // ??? -#endif // undo di << "UNDO :"; di << " limit :" << D->GetUndoLimit(); diff --git a/src/Draw/Draw_Display.cxx b/src/Draw/Draw_Display.cxx index 72d36c6512..68d3cd17fb 100755 --- a/src/Draw/Draw_Display.cxx +++ b/src/Draw/Draw_Display.cxx @@ -106,10 +106,8 @@ void Draw_Display::DrawMarker (const gp_Pnt2d& pt, C.SetLocation(pt); Draw(C, 0, 2*M_PI, Standard_False); break; -#ifndef DEB default: break; -#endif } Draw_Bounds = Standard_True; diff --git a/src/DrawDim/DrawDim.cxx b/src/DrawDim/DrawDim.cxx index 8643f3c3fb..f60fe2d057 100755 --- a/src/DrawDim/DrawDim.cxx +++ b/src/DrawDim/DrawDim.cxx @@ -85,10 +85,8 @@ void DrawDim::DrawShapeName (const TopoDS_Shape& ashape, position = BRep_Tool::Pnt(TopoDS::Vertex(ashape)); } break; -#ifndef DEB default: break; -#endif } t+=aname; //Name(); Handle(Draw_Text3D) text = new Draw_Text3D (position,t.ToCString(),Draw_blanc); diff --git a/src/DsgPrs/DsgPrs_AnglePresentation.cxx b/src/DsgPrs/DsgPrs_AnglePresentation.cxx index 304569ce2a..552581cf89 100755 --- a/src/DsgPrs/DsgPrs_AnglePresentation.cxx +++ b/src/DsgPrs/DsgPrs_AnglePresentation.cxx @@ -980,10 +980,8 @@ void DsgPrs_AnglePresentation::Add (const Handle(Prs3d_Presentation)& aPresentat length); break; } -#ifndef DEB default: break; -#endif } } diff --git a/src/DsgPrs/DsgPrs_LengthPresentation.cxx b/src/DsgPrs/DsgPrs_LengthPresentation.cxx index d61e936378..1c702fdaa2 100755 --- a/src/DsgPrs/DsgPrs_LengthPresentation.cxx +++ b/src/DsgPrs/DsgPrs_LengthPresentation.cxx @@ -476,10 +476,8 @@ void DsgPrs_LengthPresentation::Add (const Handle(Prs3d_Presentation)& aPrs, aDrawer->LengthAspect()->Arrow1Aspect()->Angle(), aDrawer->LengthAspect()->Arrow1Aspect()->Length()); break; -#ifndef DEB default: break; -#endif } Prs3d_Root::CurrentGroup(aPrs)->EndPrimitives(); diff --git a/src/Expr/Expr_Product.cxx b/src/Expr/Expr_Product.cxx index 18655066aa..37bca2523d 100755 --- a/src/Expr/Expr_Product.cxx +++ b/src/Expr/Expr_Product.cxx @@ -158,11 +158,7 @@ Handle(Expr_GeneralExpression) Expr_Product::ShallowSimplified () const Standard_Integer max = NbOperands(); Handle(Expr_GeneralExpression) op; Expr_SequenceOfGeneralExpression newops; -#ifndef DEB Standard_Real vals = 0.; -#else - Standard_Real vals; -#endif Standard_Integer nbvals = 0; Standard_Boolean subprod = Standard_False; for (i=1; (i<= max) && !subprod; i++) { diff --git a/src/Expr/Expr_Sum.cxx b/src/Expr/Expr_Sum.cxx index 2ce8ea8c50..9a11c3c6a0 100755 --- a/src/Expr/Expr_Sum.cxx +++ b/src/Expr/Expr_Sum.cxx @@ -167,11 +167,7 @@ Handle(Expr_GeneralExpression) Expr_Sum::ShallowSimplified () const sumop = new Expr_Sum(newops); return sumop->ShallowSimplified(); } -#ifndef DEB Standard_Real vals = 0.; -#else - Standard_Real vals; -#endif Standard_Boolean noone = Standard_True; for (i = 1; i <= max ; i++) { op = Operand(i); diff --git a/src/Extrema/Extrema_ExtPExtS.cxx b/src/Extrema/Extrema_ExtPExtS.cxx index 48af480209..70cf23cc3c 100755 --- a/src/Extrema/Extrema_ExtPExtS.cxx +++ b/src/Extrema/Extrema_ExtPExtS.cxx @@ -421,10 +421,8 @@ static void PerformExtPElC (Extrema_ExtPElC& E, case GeomAbs_Parabola: E.Perform(P, C->Parabola(), Tol, -Precision::Infinite(),Precision::Infinite()); return; -#ifndef DEB default: return; -#endif } } diff --git a/src/Extrema/Extrema_ExtPRevS.cxx b/src/Extrema/Extrema_ExtPRevS.cxx index a4fab0f5cb..ac49e569b1 100755 --- a/src/Extrema/Extrema_ExtPRevS.cxx +++ b/src/Extrema/Extrema_ExtPRevS.cxx @@ -120,10 +120,8 @@ static void PerformExtPElC (Extrema_ExtPElC& E, case GeomAbs_Parabola: E.Perform(P, C->Parabola(), Tol, -Precision::Infinite(),Precision::Infinite()); return; -#ifndef DEB default: return ; -#endif } } diff --git a/src/GeomFill/GeomFill_SnglrFunc.cxx b/src/GeomFill/GeomFill_SnglrFunc.cxx index 450368346c..859ea9c6bf 100755 --- a/src/GeomFill/GeomFill_SnglrFunc.cxx +++ b/src/GeomFill/GeomFill_SnglrFunc.cxx @@ -45,11 +45,7 @@ void GeomFill_SnglrFunc::SetRatio(const Standard_Real Ratio) Standard_Integer GeomFill_SnglrFunc::NbIntervals(const GeomAbs_Shape S) { -#ifndef DEB GeomAbs_Shape HCS=GeomAbs_C0; -#else - GeomAbs_Shape HCS; -#endif switch(S) { case GeomAbs_C0: HCS = GeomAbs_C2; break; case GeomAbs_C1: HCS = GeomAbs_C3; break; @@ -61,11 +57,7 @@ void GeomFill_SnglrFunc::SetRatio(const Standard_Real Ratio) void GeomFill_SnglrFunc::Intervals(TColStd_Array1OfReal& T,const GeomAbs_Shape S) { -#ifndef DEB GeomAbs_Shape HCS=GeomAbs_C0; -#else - GeomAbs_Shape HCS ; -#endif switch(S) { case GeomAbs_C0: HCS = GeomAbs_C2; break; case GeomAbs_C1: HCS = GeomAbs_C3; break; diff --git a/src/GeomliteTest/GeomliteTest_ApproxCommands.cxx b/src/GeomliteTest/GeomliteTest_ApproxCommands.cxx index 73c1d244a9..14ccfde3bc 100755 --- a/src/GeomliteTest/GeomliteTest_ApproxCommands.cxx +++ b/src/GeomliteTest/GeomliteTest_ApproxCommands.cxx @@ -97,10 +97,8 @@ static Standard_Integer NbConstraint(const AppParCurves_Constraint C1, N = 3; break; } -#ifndef DEB default: break; -#endif } switch (C2) { @@ -119,10 +117,8 @@ static Standard_Integer NbConstraint(const AppParCurves_Constraint C1, N += 3; break; } -#ifndef DEB default: break; -#endif } return N; } diff --git a/src/Graphic2d/Graphic2d_HidingGraphicObject.cxx b/src/Graphic2d/Graphic2d_HidingGraphicObject.cxx index f688895d7a..2c305ef4bd 100755 --- a/src/Graphic2d/Graphic2d_HidingGraphicObject.cxx +++ b/src/Graphic2d/Graphic2d_HidingGraphicObject.cxx @@ -193,10 +193,8 @@ void Graphic2d_HidingGraphicObject::Draw (const Handle(Graphic2d_Drawer)& aDrawe } break; } -#ifndef DEB default: break; -#endif } else { myXmin = myYmin = RealLast(); myXmax = myYmax = RealFirst(); diff --git a/src/IntCurve/IntCurve_IConicTool.cxx b/src/IntCurve/IntCurve_IConicTool.cxx index 1ff1ebc361..86ba1ee516 100755 --- a/src/IntCurve/IntCurve_IConicTool.cxx +++ b/src/IntCurve/IntCurve_IConicTool.cxx @@ -328,10 +328,8 @@ Standard_Real IntCurve_IConicTool::FindParameter(const gp_Pnt2d& P) const { ,P); break; } -#ifndef DEB default: break; -#endif } return(Param); diff --git a/src/IntCurve/IntCurve_PConicTool.cxx b/src/IntCurve/IntCurve_PConicTool.cxx index 5e3e8247a2..cef41cde78 100755 --- a/src/IntCurve/IntCurve_PConicTool.cxx +++ b/src/IntCurve/IntCurve_PConicTool.cxx @@ -83,10 +83,8 @@ void IntCurve_PConicTool::D1(const IntCurve_PConic& PConic, ElCLib::HyperbolaD1(U,PConic.Axis2(),PConic.Param1(), PConic.Param2(),Pt,Tan); break; -#ifndef DEB default: break; -#endif } } @@ -121,10 +119,8 @@ void IntCurve_PConicTool::D2(const IntCurve_PConic& PConic, ElCLib::HyperbolaD2(U,PConic.Axis2(),PConic.Param1(), PConic.Param2(),Pt,Tan,Norm); break; -#ifndef DEB default: break; -#endif } } diff --git a/src/IntCurve/IntCurve_ProjectOnPConicTool.cxx b/src/IntCurve/IntCurve_ProjectOnPConicTool.cxx index 7075237c2f..131a5111e8 100755 --- a/src/IntCurve/IntCurve_ProjectOnPConicTool.cxx +++ b/src/IntCurve/IntCurve_ProjectOnPConicTool.cxx @@ -70,10 +70,8 @@ Standard_Real IntCurve_ProjectOnPConicTool::FindParameter ,ThePConic.Param2(),P); break; } -#ifndef DEB default: break; -#endif } if(ParamInf!=ParamSup) { if(ParamGetType(); diff --git a/src/IntPatch/IntPatch_Polyhedron.cxx b/src/IntPatch/IntPatch_Polyhedron.cxx index ea6a9727cf..0b8b2ebd0a 100755 --- a/src/IntPatch/IntPatch_Polyhedron.cxx +++ b/src/IntPatch/IntPatch_Polyhedron.cxx @@ -339,11 +339,7 @@ Standard_Integer IntPatch_Polyhedron::TriConnex (const Standard_Integer Triang, Standard_Integer colP = Pivotm1 - ligP * nbdeltaVp1; // Point sur Edge position in the MaTriangle and edge typ : -#ifndef DEB Standard_Integer ligE = 0, colE = 0, typE = 0; -#else - Standard_Integer ligE, colE, typE; -#endif if (Pedge!=0) { ligE= (Pedge-1)/nbdeltaVp1; colE= (Pedge-1) - (ligE * nbdeltaVp1); @@ -359,13 +355,8 @@ Standard_Integer IntPatch_Polyhedron::TriConnex (const Standard_Integer Triang, } // Triangle position General case : -#ifndef DEB Standard_Integer linT = 0, colT = 0; Standard_Integer linO = 0, colO = 0; -#else - Standard_Integer linT, colT; - Standard_Integer linO, colO; -#endif Standard_Integer t,tt; if (Triang!=0) { t = (Triang-1)/(nbdeltaVm2); diff --git a/src/IntPolyh/IntPolyh_MaillageAffinage.cxx b/src/IntPolyh/IntPolyh_MaillageAffinage.cxx index 2485a25351..3fde2fc005 100755 --- a/src/IntPolyh/IntPolyh_MaillageAffinage.cxx +++ b/src/IntPolyh/IntPolyh_MaillageAffinage.cxx @@ -2409,11 +2409,7 @@ void CalculPtsInterTriEdgeCoplanaires2(const Standard_Integer TriSurfID, Standard_Real pe2p= Cote.Dot(PE2); Standard_Real pt1p= Cote.Dot(PT1); Standard_Real pt2p= Cote.Dot(PT2); -#ifndef DEB Standard_Real lambda1 =0.,lambda2 =0.,alpha1 =0.,alpha2 =0.; -#else - Standard_Real lambda1,lambda2,alpha1,alpha2; -#endif IntPolyh_Point PEP1,PTP1,PEP2,PTP2; if (pe1p>pe2p) { diff --git a/src/LProp/LProp_AnalyticCurInf.cxx b/src/LProp/LProp_AnalyticCurInf.cxx index 90341c5f27..c660571b72 100755 --- a/src/LProp/LProp_AnalyticCurInf.cxx +++ b/src/LProp/LProp_AnalyticCurInf.cxx @@ -76,10 +76,8 @@ void LProp_AnalyticCurInf::Perform (const GeomAbs_CurveType CType, Result.AddExtCur(0.0 , Standard_True); } break; -#ifndef DEB default: break; -#endif } } diff --git a/src/MAT2d/MAT2d_MiniPath.cxx b/src/MAT2d/MAT2d_MiniPath.cxx index 5e9ea7a1fd..d044219d07 100755 --- a/src/MAT2d/MAT2d_MiniPath.cxx +++ b/src/MAT2d/MAT2d_MiniPath.cxx @@ -75,11 +75,7 @@ void MAT2d_MiniPath::Perform TColStd_SequenceOfInteger Set2; Standard_Real DistS1S2; Standard_Integer IndiceLine1,IndiceLine2; -#ifndef DEB Standard_Integer ISuiv =0,MinOnSet1 =0,MinOnSet2 =0; -#else - Standard_Integer ISuiv,MinOnSet1,MinOnSet2; -#endif //--------------------------------------------------------------------------- // - 0 Set1 est initialise avec la ligne de depart. // Set2 contient toutes les autres. @@ -292,17 +288,9 @@ Handle(MAT2d_Connexion) MAT2d_MiniPath::MinimumL1L2 const Standard_Integer IL2) const { Extrema_POnCurv2d PointOnCurv1,PointOnCurv2; -#ifndef DEB Standard_Integer IC1,IC2,IMinC1 =0,IMinC2 =0,i; -#else - Standard_Integer IC1,IC2,IMinC1,IMinC2,i; -#endif Standard_Real DistL1L2_2,DistP1P2_2; -#ifndef DEB Standard_Real ParameterOnC1 =0.,ParameterOnC2 =0.; -#else - Standard_Real ParameterOnC1,ParameterOnC2; -#endif TColGeom2d_SequenceOfGeometry L1,L2; gp_Pnt2d Point1,Point2,P1,P2; Handle(Geom2d_Curve) Item1; diff --git a/src/MgtTopoDS/MgtTopoDS.cxx b/src/MgtTopoDS/MgtTopoDS.cxx index fbf0c80e27..324c227e95 100755 --- a/src/MgtTopoDS/MgtTopoDS.cxx +++ b/src/MgtTopoDS/MgtTopoDS.cxx @@ -138,10 +138,8 @@ Handle(PTopoDS_HShape) MgtTopoDS::Translate //TrTool.UpdateCompound(aShape,pHShape); TrTool->UpdateShape(aShape,pHShape); break; -#ifndef DEB default: break; -#endif } // bind and copy the sub-elements @@ -269,10 +267,8 @@ void MgtTopoDS::Translate //TrTool.UpdateCompound(aHShape,theShape); TrTool->UpdateShape(aHShape,theShape); break; -#ifndef DEB default: break; -#endif } // bind and copy the sub-elements @@ -369,10 +365,8 @@ void MgtTopoDS::Translate1 TrTool->MakeCompound(aPShape); TrTool->UpdateShape(aShape,aPShape); break; -#ifndef DEB default: break; -#endif } // bind and copy the sub-elements @@ -490,10 +484,8 @@ void MgtTopoDS::Translate1 //TrTool.UpdateCompound(aPShape,aShape); TrTool->UpdateShape(aPShape,aShape); break; -#ifndef DEB default: break; -#endif } // bind and copy the sub-elements diff --git a/src/OSD/OSD_Error.cxx b/src/OSD/OSD_Error.cxx index 090cde6744..b1fff5ed9f 100755 --- a/src/OSD/OSD_Error.cxx +++ b/src/OSD/OSD_Error.cxx @@ -137,10 +137,8 @@ void OSD_Error::Perror() { buffer += "Lock is already blocked by another process"; extCode = ERR_FDEADLK; break; -#ifndef DEB default: break; -#endif } break; #endif @@ -262,10 +260,8 @@ void OSD_Error::Perror() { buffer += "File is locked"; extCode = ERR_FLOCKED; break; -#ifndef DEB default: break; -#endif } break; #endif @@ -277,10 +273,8 @@ void OSD_Error::Perror() { buffer += "File is locked"; extCode = ERR_FLOCKED; break; -#ifndef DEB default: break; -#endif } break; #endif diff --git a/src/OSD/OSD_Path.cxx b/src/OSD/OSD_Path.cxx index de9ffc715d..889173e01e 100755 --- a/src/OSD/OSD_Path.cxx +++ b/src/OSD/OSD_Path.cxx @@ -376,7 +376,7 @@ OSD_Path::OSD_Path(const TCollection_AsciiString& aDependentName, MacExtract(aDependentName,myDisk,myTrek,myName,myExtension); break; default: -#ifndef DEB +#ifdef DEB cout << " WARNING WARNING : OSD Path for an Unknown SYSTEM : " << (Standard_Integer)todo << endl; #endif break ; diff --git a/src/PlotMgt/PlotMgt_PlotterParameter.cxx b/src/PlotMgt/PlotMgt_PlotterParameter.cxx index 0f9eac15af..150fd18cb3 100755 --- a/src/PlotMgt/PlotMgt_PlotterParameter.cxx +++ b/src/PlotMgt/PlotMgt_PlotterParameter.cxx @@ -408,10 +408,8 @@ void PlotMgt_PlotterParameter::Normalize () case _T_LSTR: { ProcessParamVal (NULL, FLAG_DEFVAL, myDefValue); } break; -#ifndef DEB default: break ; -#endif } // Check the configuration if (myFlags & FLAG_DEFVAL && myDefValue.IsEmpty()) diff --git a/src/ProjLib/ProjLib_ProjectOnPlane.cxx b/src/ProjLib/ProjLib_ProjectOnPlane.cxx index b6683b2b71..069b9f1c47 100755 --- a/src/ProjLib/ProjLib_ProjectOnPlane.cxx +++ b/src/ProjLib/ProjLib_ProjectOnPlane.cxx @@ -486,11 +486,7 @@ void ProjLib_ProjectOnPlane::Load(const Handle(Adaptor3d_HCurve)& C, GeomAbs_CurveType Type = C->GetType(); gp_Ax2 Axis; -#ifndef DEB Standard_Real R1 =0., R2 =0.; -#else - Standard_Real R1, R2; -#endif if ( Type != GeomAbs_Line) // on garde le parametrage myKeepParam = Standard_True; diff --git a/src/QANewBRepNaming/QANewBRepNaming.cxx b/src/QANewBRepNaming/QANewBRepNaming.cxx index 715eac0dbe..7bfabc2cb3 100755 --- a/src/QANewBRepNaming/QANewBRepNaming.cxx +++ b/src/QANewBRepNaming/QANewBRepNaming.cxx @@ -102,10 +102,8 @@ void QANewBRepNaming::LoadNamedShape (TNaming_Builder& theBuilder, { theBuilder.Select(theNS, theOS); } -#ifndef DEB default: break; -#endif } } diff --git a/src/Select3D/Select3D_SensitiveFace.cxx b/src/Select3D/Select3D_SensitiveFace.cxx index 2aa0b52d1c..c4ac79db97 100755 --- a/src/Select3D/Select3D_SensitiveFace.cxx +++ b/src/Select3D/Select3D_SensitiveFace.cxx @@ -87,11 +87,7 @@ Matches(const Standard_Real X, const Standard_Real aTol, Standard_Real& DMin) { -#ifndef DEB Standard_Real DMin2 = 0.; -#else - Standard_Real DMin2; -#endif Standard_Real Xmin,Ymin,Xmax,Ymax; if(!Bnd_Box2d(mybox2d).IsVoid()) { diff --git a/src/Select3D/Select3D_SensitiveTriangle.cxx b/src/Select3D/Select3D_SensitiveTriangle.cxx index 453dab519a..0be130f440 100755 --- a/src/Select3D/Select3D_SensitiveTriangle.cxx +++ b/src/Select3D/Select3D_SensitiveTriangle.cxx @@ -98,10 +98,8 @@ Matches(const Standard_Real X, case Select3D_TOS_INTERIOR: Res = Status(X,Y,aTol,DMin); return (Res==0 || Res == 1); -#ifndef DEB default: break; -#endif } return Standard_True; } diff --git a/src/SelectMgr/SelectMgr_SelectionManager.cxx b/src/SelectMgr/SelectMgr_SelectionManager.cxx index f6d6730167..402b40d9b3 100755 --- a/src/SelectMgr/SelectMgr_SelectionManager.cxx +++ b/src/SelectMgr/SelectMgr_SelectionManager.cxx @@ -288,10 +288,8 @@ Activate(const Handle(SelectMgr_SelectableObject)& anObject, Sel->UpdateStatus(SelectMgr_TOU_None); break; } -#ifndef DEB default: break; -#endif } curview->Activate(Sel,AutomaticProj); @@ -328,10 +326,8 @@ Activate(const Handle(SelectMgr_SelectableObject)& anObject, anObject->UpdateLocation(Sel); break; } -#ifndef DEB default: break; -#endif } Sel->UpdateStatus(SelectMgr_TOU_None); @@ -654,10 +650,8 @@ RecomputeSelection (const Handle(SelectMgr_SelectableObject)& anObject, case SelectMgr_TOU_Partial: anObject->UpdateLocation(Sel); break; -#ifndef DEB default: break; -#endif } if(Found){ VS->Convert(Sel); @@ -692,10 +686,8 @@ void SelectMgr_SelectionManager::Update(const Handle(SelectMgr_SelectableObject) anObject->UpdateLocation(Sel); wasrecomputed = Standard_True; break; -#ifndef DEB default: break; -#endif } Sel->UpdateStatus(SelectMgr_TOU_None); } @@ -714,10 +706,8 @@ void SelectMgr_SelectionManager::Update(const Handle(SelectMgr_SelectableObject) anObject->UpdateLocation(Sel); wasrecomputed = Standard_True; break; -#ifndef DEB default: break; -#endif } if(wasrecomputed) VS->Convert(Sel); @@ -758,10 +748,8 @@ Update(const Handle(SelectMgr_SelectableObject)& anObject, anObject->UpdateLocation(Sel); wasrecomputed = Standard_True; break; -#ifndef DEB default: break; -#endif } Sel->UpdateStatus(SelectMgr_TOU_None); } @@ -775,10 +763,8 @@ Update(const Handle(SelectMgr_SelectableObject)& anObject, anObject->UpdateLocation(Sel); wasrecomputed = Standard_True; break; -#ifndef DEB default: break; -#endif } if(wasrecomputed) aViewSel->Convert(Sel); diff --git a/src/TestTopOpe/TestTopOpe_BOOP.cxx b/src/TestTopOpe/TestTopOpe_BOOP.cxx index 64bf77f7b8..208c36a888 100755 --- a/src/TestTopOpe/TestTopOpe_BOOP.cxx +++ b/src/TestTopOpe/TestTopOpe_BOOP.cxx @@ -243,11 +243,7 @@ void TestTopOpe_BOOP::Booope(const char* key,const char *namres) else if (o == BOOP_C12 || o == BOOP_C21 || o == BOOP_COM || o == BOOP_FUS) { -#ifndef DEB TopAbs_State t1=TopAbs_UNKNOWN,t2=TopAbs_UNKNOWN; -#else - TopAbs_State t1,t2; -#endif if (o == BOOP_C12) { t1 = TopAbs_OUT; t2 = TopAbs_IN; } else if (o == BOOP_C21) { t1 = TopAbs_IN; t2 = TopAbs_OUT; } else if (o == BOOP_COM) { t1 = TopAbs_IN; t2 = TopAbs_IN; } diff --git a/src/TestTopOpe/TestTopOpe_EditBOOP.cxx b/src/TestTopOpe/TestTopOpe_EditBOOP.cxx index 6766f565b1..de6de5a787 100755 --- a/src/TestTopOpe/TestTopOpe_EditBOOP.cxx +++ b/src/TestTopOpe/TestTopOpe_EditBOOP.cxx @@ -49,10 +49,8 @@ void TestTopOpe_BOOP::SetTol(const TopOpeBRepDS_Kind K,const Standard_Integer in Poin.Tolerance(tol); break; } -#ifndef DEB default: break; -#endif } TopOpeBRepDS::Print(K, index, cout); cout<DS(); - const TopOpeBRepDS_DataStructure& DS = DataStructure()->DS(); // How to do static <--> const -#else const TopOpeBRepDS_DataStructure& DS = DataStructure()->DS(); -#endif TopTools_ListIteratorOfListOfShape itloe; TopOpeBRepDS_CurveExplorer cex(DS,Standard_True); // Standard_Integer ic, icm; diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_ffsfs.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_ffsfs.cxx index 461c868864..455745eebb 100755 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_ffsfs.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_ffsfs.cxx @@ -62,12 +62,8 @@ static Standard_Integer FUN_getAncestorFsp(TopOpeBRepBuild_Builder& B,TopOpeBRep static Standard_Integer FUN_getAncestorFsp(TopOpeBRepBuild_Builder& B,TopOpeBRepTool_ShapeClassifier& SC,const TopTools_ListOfShape& LF,const TopoDS_Shape& fsp,Standard_Boolean& p3ddef,gp_Pnt& p3d) { -#ifndef DEB -// static const TopOpeBRepDS_DataStructure& BDS = B.DataStructure()->DS(); const TopOpeBRepDS_DataStructure& BDS = B.DataStructure()->DS(); // How to do static <--> const -#else - const TopOpeBRepDS_DataStructure& BDS = B.DataStructure()->DS(); -#endif + TopTools_ListIteratorOfListOfShape itf(LF); for (; itf.More(); itf.Next()){ const TopoDS_Face& f = TopoDS::Face(itf.Value()); @@ -99,11 +95,7 @@ static Standard_Integer FUN_getAncestorFsp(TopOpeBRepBuild_Builder& B,TopOpeBRep { // IMPORTANT : fsp is split IN/OUT of F1,so it has only one ancestor face // LF1 faces sdm with LF2 -#ifndef DEB const TopOpeBRepDS_DataStructure& BDS = B.DataStructure()->DS(); -#else - const TopOpeBRepDS_DataStructure& BDS = B.DataStructure()->DS(); -#endif Standard_Boolean of1,of2; FUNBUILD_ANCESTORRANKGET(B,fsp,of1,of2); Standard_Integer rkfsp = 0; if (of1 && !of2) rkfsp = 1; @@ -182,12 +174,7 @@ void TopOpeBRepBuild_Builder::GFillFaceSFS(const TopoDS_Shape& FOR,const TopTool Standard_Integer iF; Standard_Boolean tSPS = GtraceSPS(FOR,iF); if(tSPS)cout<DS(); const TopOpeBRepDS_DataStructure& BDS = myDataStructure->DS(); -#else - const TopOpeBRepDS_DataStructure& BDS = myDataStructure->DS(); -#endif Standard_Boolean tosplit = GToSplit(FOR,TB1); Standard_Boolean tomerge = GToMerge(FOR); #ifdef DEB