From 302f96fb0d24aba0d37f967d3a5425a8ef7b1517 Mon Sep 17 00:00:00 2001 From: omy Date: Fri, 12 Jul 2013 12:37:38 +0400 Subject: [PATCH] 0023947: Eliminate trivial compiler warnings in MSVC++ with warning level 4 Fix first subset of warnings (about 100) - while(1) and similar constructs replaced by for(;;) - some uninitialized variables corrected Got rid of Warning C4189: local variable is initialised but not referenced Corrected mistakes after getting rid of C4189 compiler warning Corrected some mistakes that led to compiling errors Fixed test case because of improvement message - removed unnecessary TODO. Small fix: tabs have been replaced with whitespaces. Added TODO for Windows platform removed last TODO Corrected mistakes, returned some #ifdef DEB code, fixed test case . Restoring a few places which have been modified too much Small grammar fix Deleted unnecessary puts in bugs/end --- src/Adaptor3d/Adaptor3d_IsoCurve.cxx | 1 - .../Adaptor3d_SurfaceOfLinearExtrusion.cxx | 3 - src/BOPAlgo/BOPAlgo_ArgumentAnalyzer.cxx | 1 - src/BOPAlgo/BOPAlgo_BuilderFace.cxx | 2 +- src/BOPAlgo/BOPAlgo_BuilderSolid.cxx | 5 +- src/BOPAlgo/BOPAlgo_Builder_2.cxx | 2 +- src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx | 2 +- src/BOPAlgo/BOPAlgo_PaveFiller_6.cxx | 5 - src/BOPAlgo/BOPAlgo_Tools.cxx | 4 +- src/BOPAlgo/BOPAlgo_WireSplitter.cxx | 2 +- src/BOPCol/BOPCol_Array1.hxx | 4 +- src/BOPDS/BOPDS_DS.cxx | 4 +- src/BOPDS/BOPDS_SubIterator.cxx | 1 - src/BOPTools/BOPTools_AlgoTools.cxx | 4 +- src/BOPTools/BOPTools_AlgoTools_2.cxx | 2 +- src/BRep/BRep_Builder.cxx | 8 - src/BRepAlgo/BRepAlgo_Loop.cxx | 46 +++-- src/BRepBuilderAPI/BRepBuilderAPI_Collect.cxx | 1 - src/BRepClass3d/BRepClass3d_SolidExplorer.cxx | 5 +- src/BRepFeat/BRepFeat.cxx | 25 ++- src/BRepFeat/BRepFeat_MakeLinearForm.cxx | 4 - src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx | 4 - src/BRepFill/BRepFill_CompatibleWires.cxx | 5 - src/BRepFill/BRepFill_OffsetWire.cxx | 5 +- src/BRepFill/BRepFill_TrimShellCorner.cxx | 1 - src/BRepLib/BRepLib_FindSurface.cxx | 4 +- src/BRepMesh/BRepMesh_Delaun.cxx | 2 - src/BRepMesh/BRepMesh_VertexTool.cxx | 2 +- src/BRepOffset/BRepOffset_MakeOffset.cxx | 6 - src/BRepOffset/BRepOffset_Offset.cxx | 1 - .../BRepOffsetAPI_MiddlePath.cxx | 7 +- src/BRepTest/BRepTest_SurfaceCommands.cxx | 18 -- src/BiTgte/BiTgte_Blend.cxx | 5 +- src/BndLib/BndLib_AddSurface.cxx | 2 - src/ChFi3d/ChFi3d_Builder_0.cxx | 2 +- src/ChFi3d/ChFi3d_Builder_6.cxx | 2 +- src/DDataStd/DDataStd_BasicCommands.cxx | 2 - src/DDataStd/DDataStd_Sample.cxx | 5 - .../DNaming_BooleanOperationDriver.cxx | 1 - src/DPrsStd/DPrsStd_Sample.cxx | 6 - src/Draw/Draw_BasicCommands.cxx | 2 +- src/Draw/Draw_VariableCommands.cxx | 4 +- src/Draw/Draw_Window.cxx | 3 +- src/Extrema/Extrema_FuncExtPS.cxx | 2 - src/Extrema/Extrema_GenExtPS.cxx | 10 +- src/FSD/FSD_CmpFile.cxx | 3 +- src/FSD/FSD_File.cxx | 3 +- src/FWOSDriver/FWOSDriver_Driver.cxx | 1 - src/GeomFill/GeomFill_NSections.cxx | 2 - .../GeometryTest_CurveCommands.cxx | 1 - src/HLRTopoBRep/HLRTopoBRep_OutLiner.cxx | 4 +- src/IFSelect/IFSelect_SessionFile.cxx | 2 +- src/IGESFile/igesread.c | 2 +- src/IntAna/IntAna_Curve.cxx | 1 - src/IntPatch/IntPatch_ALineToWLine.cxx | 4 +- src/IntPatch/IntPatch_PrmPrmIntersection.cxx | 9 +- src/IntPolyh/IntPolyh_MaillageAffinage.cxx | 2 - src/IntTools/IntTools_BeanBeanIntersector.cxx | 2 +- src/IntTools/IntTools_BeanFaceIntersector.cxx | 1 - src/IntTools/IntTools_EdgeEdge.cxx | 2 +- src/IntTools/IntTools_EdgeEdge_1.cxx | 4 +- src/IntTools/IntTools_EdgeFace.cxx | 6 +- src/IntTools/IntTools_FClass2d.cxx | 2 +- src/IntTools/IntTools_FaceFace.cxx | 2 +- src/LDOM/LDOMParser.cxx | 4 +- src/LDOM/LDOM_CharReference.cxx | 4 +- src/LDOM/LDOM_Element.cxx | 4 +- src/LDOM/LDOM_XmlReader.cxx | 8 +- src/Message/Message_MsgFile.cxx | 2 +- src/NCollection/NCollection_IncAllocator.cxx | 13 +- src/OSD/OSD.cxx | 3 +- src/OSD/OSD_DirectoryIterator.cxx | 4 +- src/OSD/OSD_Disk.cxx | 2 +- src/OSD/OSD_File.cxx | 23 ++- src/OSD/OSD_FileIterator.cxx | 4 +- src/OSD/OSD_FileNode.cxx | 4 +- src/OSD/OSD_Host.cxx | 3 +- src/OSD/OSD_MAllocHook.cxx | 15 +- src/OSD/OSD_Path.cxx | 4 +- src/OSD/OSD_Process.cxx | 2 +- src/OSD/OSD_SharedLibrary.cxx | 2 +- src/OSD/OSD_WNT.cxx | 22 +-- src/OSD/OSD_signal_WNT.cxx | 17 +- src/OpenGl/OpenGl_LayerList.cxx | 1 - src/OpenGl/OpenGl_Trihedron.cxx | 1 - src/OpenGl/OpenGl_View_2.cxx | 2 - src/Prs3d/Prs3d_RadiusAspect.cxx | 2 +- src/QABugs/QABugs_1.cxx | 2 - src/QABugs/QABugs_11.cxx | 3 +- src/QABugs/QABugs_13.cxx | 3 - src/QABugs/QABugs_2.cxx | 1 - src/QABugs/QABugs_3.cxx | 4 +- src/QABugs/QABugs_9.cxx | 2 +- .../QANewBRepNaming_Gluing.cxx | 2 - .../QANewBRepNaming_Limitation.cxx | 1 - src/QANewDBRepNaming/QANewDBRepNaming.cxx | 7 +- src/QANewModTopOpe/QANewModTopOpe.cxx | 3 +- .../QANewModTopOpe_Intersection.cxx | 1 - src/QANewModTopOpe/QANewModTopOpe_Tools.cxx | 2 +- .../RWHeaderSection_GeneralModule.cxx | 2 +- ...WStepAP214_RWAppliedApprovalAssignment.cxx | 5 +- ...epAP214_RWAppliedDateAndTimeAssignment.cxx | 10 +- .../RWStepAP214_RWAppliedDateAssignment.cxx | 10 +- ...RWStepAP214_RWAppliedDocumentReference.cxx | 5 +- ...pAP214_RWAppliedOrganizationAssignment.cxx | 10 +- ...AppliedPersonAndOrganizationAssignment.cxx | 10 +- ...ppliedSecurityClassificationAssignment.cxx | 5 +- ...WAutoDesignActualDateAndTimeAssignment.cxx | 10 +- ...AP214_RWAutoDesignActualDateAssignment.cxx | 10 +- ...epAP214_RWAutoDesignApprovalAssignment.cxx | 5 +- ...14_RWAutoDesignDateAndPersonAssignment.cxx | 10 +- ...tepAP214_RWAutoDesignDocumentReference.cxx | 5 +- ...AutoDesignNominalDateAndTimeAssignment.cxx | 10 +- ...P214_RWAutoDesignNominalDateAssignment.cxx | 10 +- ...214_RWAutoDesignOrganizationAssignment.cxx | 10 +- ...oDesignPersonAndOrganizationAssignment.cxx | 10 +- ...DesignSecurityClassificationAssignment.cxx | 5 +- ...WStepBasic_RWApplicationContextElement.cxx | 5 +- src/Resource/Resource_Manager.cxx | 3 +- src/STEPCAFControl/STEPCAFControl_Reader.cxx | 1 - src/Select3D/Select3D_SensitiveEntity.cxx | 2 +- .../ShapeAnalysis_FreeBounds.cxx | 2 +- src/ShapeFix/ShapeFix_ComposeShell.cxx | 4 +- src/Standard/Standard.cxx | 19 +- src/Standard/Standard_MMgrOpt.cxx | 2 +- src/StdPrs/StdPrs_Curve.cxx | 4 +- src/StdPrs/StdPrs_WFRestrictedFace.cxx | 1 - src/StepBasic/StepBasic_SiUnit.cxx | 2 +- src/StepData/StepData_DefaultGeneral.cxx | 2 +- src/StepData/StepData_DescrGeneral.cxx | 2 +- src/StepData/StepData_PDescr.cxx | 2 +- src/StepData/StepData_Simple.cxx | 2 +- src/StepData/StepData_StepReaderData.cxx | 2 +- .../StepShape_OrientedClosedShell.cxx | 2 +- src/StepShape/StepShape_OrientedFace.cxx | 2 +- src/StepShape/StepShape_OrientedOpenShell.cxx | 2 +- src/Storage/Storage_Schema.cxx | 4 +- ...ColStd_MapIteratorOfPackedMapOfInteger.cxx | 6 +- src/TColStd/TColStd_PackedMapOfInteger.cxx | 10 +- src/TCollection/TCollection_AsciiString.cxx | 16 +- src/TDF/TDF_Attribute.cxx | 2 +- src/TDataStd/TDataStd_Directory.cxx | 2 +- src/TDataStd/TDataStd_NoteBook.cxx | 2 +- src/TDataXtd/TDataXtd_Shape.cxx | 2 +- src/TFunction/TFunction_Function.cxx | 2 +- src/TNaming/TNaming_UsedShapes.cxx | 2 +- src/TPrsStd/TPrsStd_ConstraintTools.cxx | 2 +- src/TestTopOpe/FILES | 1 - src/TestTopOpe/TestTopOpe.cxx | 2 +- src/TestTopOpe/TestTopOpe_CORCommands.cxx | 4 +- src/TestTopOpe/TestTopOpe_DSACommands.cxx | 167 ------------------ .../TestTopOpeDraw_OtherCommands.cxx | 2 +- src/TopOpeBRep/TopOpeBRep_EdgesFiller.cxx | 23 +-- .../TopOpeBRep_EdgesIntersector.cxx | 14 +- src/TopOpeBRep/TopOpeBRep_FaceEdgeFiller.cxx | 3 - src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx | 19 +- src/TopOpeBRep/TopOpeBRep_Hctxee2d.cxx | 73 ++++---- src/TopOpeBRep/TopOpeBRep_Point2d.cxx | 3 +- src/TopOpeBRep/TopOpeBRep_ProcessGR.cxx | 13 +- .../TopOpeBRep_VPointInterIterator.cxx | 8 - src/TopOpeBRepTool/TopOpeBRepTool_CORRISO.cxx | 59 ++----- .../TopOpeBRepTool_TOPOLOGY.cxx | 9 +- src/TopOpeBRepTool/TopOpeBRepTool_tol.cxx | 4 - src/V3d/V3d_View.cxx | 1 - src/V3d/V3d_View_3.cxx | 25 +-- src/ViewerTest/ViewerTest_OpenGlCommands.cxx | 1 - src/ViewerTest/ViewerTest_ViewerCommands.cxx | 1 - src/Voxel/Voxel_FastConverter.cxx | 4 +- src/VrmlData/VrmlData_Geometry.cxx | 4 +- src/VrmlData/VrmlData_Scene.cxx | 2 +- src/VrmlData/VrmlData_ShapeConvert.cxx | 2 +- src/WNT/EHDC.cxx | 4 +- src/WNT/WNT_Window.cxx | 39 ---- src/XSDRAW/XSDRAW.cxx | 5 +- src/XSDRAWSTEP/XSDRAWSTEP.cxx | 2 +- .../XmlMDataStd_IntegerArrayDriver.cxx | 5 +- .../XmlMDataStd_NamedDataDriver.cxx | 4 +- .../XmlMDataStd_RealArrayDriver.cxx | 5 +- src/XmlObjMgt/XmlObjMgt.cxx | 2 +- src/gp/gp_GTrsf.cxx | 2 +- src/gp/gp_GTrsf2d.cxx | 2 +- src/gp/gp_Mat.cxx | 2 +- src/gp/gp_Mat2d.cxx | 2 +- src/gp/gp_Trsf.cxx | 10 +- src/gp/gp_Trsf2d.cxx | 10 +- src/math/math_DirectPolynomialRoots.cxx | 2 +- tests/bugs/begin | 146 +++++++-------- tests/bugs/end | 50 +++--- tests/bugs/modalg_1/buc60462_2 | 14 +- 189 files changed, 455 insertions(+), 1010 deletions(-) delete mode 100755 src/TestTopOpe/TestTopOpe_DSACommands.cxx diff --git a/src/Adaptor3d/Adaptor3d_IsoCurve.cxx b/src/Adaptor3d/Adaptor3d_IsoCurve.cxx index f083f249be..d2df8c38c6 100755 --- a/src/Adaptor3d/Adaptor3d_IsoCurve.cxx +++ b/src/Adaptor3d/Adaptor3d_IsoCurve.cxx @@ -805,7 +805,6 @@ gp_Elips Adaptor3d_IsoCurve::Ellipse() const default: { Standard_NoSuchObject::Raise("Adaptor3d_IsoCurve:Ellipse"); - return gp_Elips(); } } diff --git a/src/Adaptor3d/Adaptor3d_SurfaceOfLinearExtrusion.cxx b/src/Adaptor3d/Adaptor3d_SurfaceOfLinearExtrusion.cxx index d61b05c321..9855ab592f 100755 --- a/src/Adaptor3d/Adaptor3d_SurfaceOfLinearExtrusion.cxx +++ b/src/Adaptor3d/Adaptor3d_SurfaceOfLinearExtrusion.cxx @@ -492,9 +492,6 @@ GeomAbs_SurfaceType Adaptor3d_SurfaceOfLinearExtrusion::GetType() const return GeomAbs_SurfaceOfExtrusion; } - - // portage WNT - return GeomAbs_SurfaceOfExtrusion; } //======================================================================= diff --git a/src/BOPAlgo/BOPAlgo_ArgumentAnalyzer.cxx b/src/BOPAlgo/BOPAlgo_ArgumentAnalyzer.cxx index 65cc142370..44349abccc 100644 --- a/src/BOPAlgo/BOPAlgo_ArgumentAnalyzer.cxx +++ b/src/BOPAlgo/BOPAlgo_ArgumentAnalyzer.cxx @@ -333,7 +333,6 @@ void BOPAlgo_ArgumentAnalyzer::TestSelfInterferences() Standard_Integer aNb[6] = {aVVs.Extent(), aVEs.Extent(), aEEs.Extent(), aVFs.Extent(), aEFs.Extent(), aFFs.Extent()}; // - Standard_Integer ind = 0; for (Standard_Integer aTypeInt = 0; aTypeInt < 6; ++aTypeInt) { for (Standard_Integer i = 0; i < aNb[aTypeInt]; ++i) { BOPDS_Interf* aInt = (aTypeInt==0) ? (BOPDS_Interf*)(&aVVs(i)) : diff --git a/src/BOPAlgo/BOPAlgo_BuilderFace.cxx b/src/BOPAlgo/BOPAlgo_BuilderFace.cxx index 9794138d5b..5ad003ef6e 100644 --- a/src/BOPAlgo/BOPAlgo_BuilderFace.cxx +++ b/src/BOPAlgo/BOPAlgo_BuilderFace.cxx @@ -182,7 +182,7 @@ static myShapesToAvoid.Clear(); // iCnt=0; - while (1) { + for(;;) { ++iCnt; bFound=Standard_False; // diff --git a/src/BOPAlgo/BOPAlgo_BuilderSolid.cxx b/src/BOPAlgo/BOPAlgo_BuilderSolid.cxx index c873bd8db9..690ac9e158 100644 --- a/src/BOPAlgo/BOPAlgo_BuilderSolid.cxx +++ b/src/BOPAlgo/BOPAlgo_BuilderSolid.cxx @@ -166,7 +166,7 @@ static myShapesToAvoid.Clear(); // iCnt=0; - while (1) { + for(;;) { ++iCnt; bFound=Standard_False; // @@ -178,9 +178,6 @@ static if (!myShapesToAvoid.Contains(aF)) { BOPTools::MapShapesAndAncestors(aF, TopAbs_EDGE, TopAbs_FACE, aMEF); } - else { - int a=0; - } } aNbE=aMEF.Extent(); // diff --git a/src/BOPAlgo/BOPAlgo_Builder_2.cxx b/src/BOPAlgo/BOPAlgo_Builder_2.cxx index bba4e8a302..54f2a9a601 100644 --- a/src/BOPAlgo/BOPAlgo_Builder_2.cxx +++ b/src/BOPAlgo/BOPAlgo_Builder_2.cxx @@ -570,7 +570,7 @@ void MakeBlocksCnx(const BOPCol_IndexedDataMapOfShapeListOfShape& aMILI, aMVAdd.Clear(); // aMVP.Add(nV); - while(1) { + for(;;) { aNbVP=aMVP.Extent(); for (j=1; j<=aNbVP; ++j) { const TopoDS_Shape& nVP=aMVP(j); diff --git a/src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx b/src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx index 88b3cc3f1a..833259a99d 100644 --- a/src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx +++ b/src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx @@ -523,7 +523,7 @@ BOPCol_MapIteratorOfMapOfInteger aIt1; // aMIP.Add(i); - while(1) { + for(;;) { aNbIP=aMIP.Extent(); aIt1.Initialize(aMIP); for(; aIt1.More(); aIt1.Next()) { diff --git a/src/BOPAlgo/BOPAlgo_PaveFiller_6.cxx b/src/BOPAlgo/BOPAlgo_PaveFiller_6.cxx index 9e5522c2e5..ea639d693b 100644 --- a/src/BOPAlgo/BOPAlgo_PaveFiller_6.cxx +++ b/src/BOPAlgo/BOPAlgo_PaveFiller_6.cxx @@ -327,8 +327,6 @@ static void ToleranceFF(const TopoDS_Face& aF1, for (j=0; jHasFaceInfo(i)) { continue; } diff --git a/src/BOPAlgo/BOPAlgo_Tools.cxx b/src/BOPAlgo/BOPAlgo_Tools.cxx index 00f08c927b..7c49afa4ac 100644 --- a/src/BOPAlgo/BOPAlgo_Tools.cxx +++ b/src/BOPAlgo/BOPAlgo_Tools.cxx @@ -59,7 +59,7 @@ aMVAdd.Clear(); // aMVP.Add(nV); - while(1) { + for(;;) { aNbVP=aMVP.Extent(); for (j=1; j<=aNbVP; ++j) { nVP=aMVP(j); @@ -215,7 +215,7 @@ aMVAdd.Clear(); // aMVP.Add(nV); - while(1) { + for(;;) { aNbVP=aMVP.Extent(); for (j=1; j<=aNbVP; ++j) { const Handle(BOPDS_PaveBlock)& nVP=aMVP(j); diff --git a/src/BOPAlgo/BOPAlgo_WireSplitter.cxx b/src/BOPAlgo/BOPAlgo_WireSplitter.cxx index a2ff1b90a9..0394e425d8 100644 --- a/src/BOPAlgo/BOPAlgo_WireSplitter.cxx +++ b/src/BOPAlgo/BOPAlgo_WireSplitter.cxx @@ -198,7 +198,7 @@ // aMVP.Add(aV); // - while(1) { + for(;;) { aNbVP=aMVP.Extent(); for (k=1; k<=aNbVP; ++k) { const TopoDS_Shape& aVP=aMVP(k); diff --git a/src/BOPCol/BOPCol_Array1.hxx b/src/BOPCol/BOPCol_Array1.hxx index df9b868746..a9b4dd761a 100644 --- a/src/BOPCol/BOPCol_Array1.hxx +++ b/src/BOPCol/BOPCol_Array1.hxx @@ -284,7 +284,7 @@ template BOPCol_PMemBlock pBlock, pNext; // pBlock=myPBlock1; - while(1) { + for(;;) { pNext=pBlock->myNext; if(!pNext) { myPBlock=pBlock; @@ -321,7 +321,7 @@ template BOPCol_PMemBlock pBlock, pNext; // pBlock=myPBlock1; - while(1) { + for(;;) { pNext=pBlock->myNext; if(!pNext) { myPBlock=pBlock; diff --git a/src/BOPDS/BOPDS_DS.cxx b/src/BOPDS/BOPDS_DS.cxx index 57c1564bbe..9a7cefd2bb 100644 --- a/src/BOPDS/BOPDS_DS.cxx +++ b/src/BOPDS/BOPDS_DS.cxx @@ -1379,7 +1379,7 @@ static } // const BOPCol_MapOfInteger& aMVIn1=aFI1.VerticesIn(); - aIt.Initialize(aMVOn1); + aIt.Initialize(aMVIn1); for (; aIt.More(); aIt.Next()) { nV=aIt.Value(); aMI.Add(nV); @@ -1393,7 +1393,7 @@ static } // const BOPCol_MapOfInteger& aMVIn2=aFI2.VerticesIn(); - aIt.Initialize(aMVOn1); + aIt.Initialize(aMVIn2); for (; aIt.More(); aIt.Next()) { nV=aIt.Value(); aMI.Add(nV); diff --git a/src/BOPDS/BOPDS_SubIterator.cxx b/src/BOPDS/BOPDS_SubIterator.cxx index e10c1fe634..0412917c80 100644 --- a/src/BOPDS/BOPDS_SubIterator.cxx +++ b/src/BOPDS/BOPDS_SubIterator.cxx @@ -230,7 +230,6 @@ i=aIt2.Value(); // const BOPDS_ShapeInfo& aSI=myDS->ShapeInfo(i); - const TopoDS_Shape& aSi=aSI.Shape(); const Bnd_Box& aBoxEx=aSI.Box(); // aSelector.Clear(); diff --git a/src/BOPTools/BOPTools_AlgoTools.cxx b/src/BOPTools/BOPTools_AlgoTools.cxx index 893c57d9fa..c6e3bf372d 100644 --- a/src/BOPTools/BOPTools_AlgoTools.cxx +++ b/src/BOPTools/BOPTools_AlgoTools.cxx @@ -140,7 +140,7 @@ static aMAdd.Clear(); aMAdd.Add(aF1); // - while(1) { + for(;;) { aMAdd1.Clear(); // aNbAdd = aMAdd.Extent(); @@ -374,7 +374,7 @@ static const TopoDS_Shape& aF1=theLFIn.First(); aMAdd.Add(aF1); // - while(1) { + for(;;) { aMAdd1.Clear(); aNbAdd = aMAdd.Extent(); for (i=1; i<=aNbAdd; ++i) { diff --git a/src/BOPTools/BOPTools_AlgoTools_2.cxx b/src/BOPTools/BOPTools_AlgoTools_2.cxx index db27bb58d0..e57f7624b6 100644 --- a/src/BOPTools/BOPTools_AlgoTools_2.cxx +++ b/src/BOPTools/BOPTools_AlgoTools_2.cxx @@ -477,7 +477,7 @@ static TopoDS_Iterator aItC; // aLC.Append (theC1); - while(1) { + for(;;) { aLC1.Clear(); aIt.Initialize(aLC); for (; aIt.More(); aIt.Next()) { diff --git a/src/BRep/BRep_Builder.cxx b/src/BRep/BRep_Builder.cxx index 333727e1e4..5ab0f4ffc9 100755 --- a/src/BRep/BRep_Builder.cxx +++ b/src/BRep/BRep_Builder.cxx @@ -115,10 +115,6 @@ static void UpdateCurves(BRep_ListOfCurveRepresentation& lcr, GC = Handle(BRep_GCurve)::DownCast(itcr.Value()); if (!GC.IsNull()) { if (GC->IsCurve3D()) { -#ifdef DEB - const Handle(Geom_Curve)& Crv = -#endif - GC->Curve3D(); // if (!C.IsNull()) { //xpu031198, edge degeneree // xpu151298 : parameters can be setted for null curves @@ -185,10 +181,6 @@ static void UpdateCurves(BRep_ListOfCurveRepresentation& lcr, GC = Handle(BRep_GCurve)::DownCast(itcr.Value()); if (!GC.IsNull()) { if (GC->IsCurve3D()) { -#ifdef DEB - const Handle(Geom_Curve)& Crv = -#endif - GC->Curve3D(); // if (!C.IsNull()) { //xpu031198, edge degeneree // xpu151298 : parameters can be setted for null curves diff --git a/src/BRepAlgo/BRepAlgo_Loop.cxx b/src/BRepAlgo/BRepAlgo_Loop.cxx index 9021eca6e5..c24f6d29fd 100755 --- a/src/BRepAlgo/BRepAlgo_Loop.cxx +++ b/src/BRepAlgo/BRepAlgo_Loop.cxx @@ -532,7 +532,6 @@ void BRepAlgo_Loop::Perform() } } #endif - //------------------------------------------------ // Cut edges //------------------------------------------------ @@ -573,11 +572,11 @@ void BRepAlgo_Loop::Perform() TopTools_MapOfShape Done; for (Mapit.Initialize(MVE); Mapit.More();Mapit.Next()) { for (itl.Initialize(Mapit.Value()); itl.More(); itl.Next()) { - TopoDS_Edge& E = TopoDS::Edge(itl.Value()); - if (Done.Add(E)) { - sprintf(name,"EEC_%d_%d",NbLoops,NbEdges++); - DBRep::Set(name,E); - } + TopoDS_Edge& E = TopoDS::Edge(itl.Value()); + if (Done.Add(E)) { + sprintf(name,"EEC_%d_%d",NbLoops,NbEdges++); + DBRep::Set(name,E); + } } } } @@ -633,14 +632,14 @@ void BRepAlgo_Loop::Perform() UsedEdges.Add(CE); if (!MVE.IsBound(CV) || MVE(CV).IsEmpty()) { - End = Standard_True; + End = Standard_True; } else { - End = !SelectEdge(myFace,CE,CV,NE,MVE(CV)); - if (!End) { - CE = NE; - if (MVE(CV).IsEmpty()) MVE.UnBind(CV); - } + End = !SelectEdge(myFace,CE,CV,NE,MVE(CV)); + if (!End) { + CE = NE; + if (MVE(CV).IsEmpty()) MVE.UnBind(CV); + } } } //-------------------------------------------------- @@ -650,28 +649,28 @@ void BRepAlgo_Loop::Perform() TopExp_Explorer explo( NW, TopAbs_VERTEX ); for (; explo.More(); explo.Next()) { - const TopoDS_Vertex& aV = TopoDS::Vertex( explo.Current() ); - Handle(BRep_TVertex)& TV = *((Handle(BRep_TVertex)*) &(aV).TShape()); - TV->Tolerance( Tol ); - TV->Modified( Standard_True ); + const TopoDS_Vertex& aV = TopoDS::Vertex( explo.Current() ); + Handle(BRep_TVertex)& TV = *((Handle(BRep_TVertex)*) &(aV).TShape()); + TV->Tolerance( Tol ); + TV->Modified( Standard_True ); } for (explo.Init( NW, TopAbs_EDGE ); explo.More(); explo.Next()) { - const TopoDS_Edge& aE = TopoDS::Edge( explo.Current() ); - Handle(BRep_TEdge)& TE = *((Handle(BRep_TEdge)*) &(aE).TShape()); - TE->Tolerance( Tol ); - TE->Modified( Standard_True ); + const TopoDS_Edge& aE = TopoDS::Edge( explo.Current() ); + Handle(BRep_TEdge)& TE = *((Handle(BRep_TEdge)*) &(aE).TShape()); + TE->Tolerance( Tol ); + TE->Modified( Standard_True ); } if (VF.IsSame(CV) && SamePnt2d(VF,EF,CE,myFace)) myNewWires.Append (NW); - else { #ifdef DEB + else { cout <<"BRepAlgo_Loop: Open Wire"<= 1) { - Standard_Real Dist2Min = extpc.SquareDistance(1); - Standard_Integer kmin = 1; - for (Standard_Integer k=2; k<=extpc.NbExt(); k++) { - Standard_Real Dist2 = extpc.SquareDistance(k); - if (Dist2 < Dist2Min) { - Dist2Min = Dist2; - kmin = k; - } - } - nbp++; -#ifdef DEB - Standard_Real prmp = extpc.Point(kmin).Parameter(); -#else - extpc.Point(kmin).Parameter(); -#endif + Standard_Real Dist2Min = extpc.SquareDistance(1); + Standard_Integer kmin = 1; + for (Standard_Integer k=2; k<=extpc.NbExt(); k++) { + Standard_Real Dist2 = extpc.SquareDistance(k); + if (Dist2 < Dist2Min) { + Dist2Min = Dist2; + kmin = k; + } + } + nbp++; } } } diff --git a/src/BRepFeat/BRepFeat_MakeLinearForm.cxx b/src/BRepFeat/BRepFeat_MakeLinearForm.cxx index c47e5246f8..6111b0db2a 100755 --- a/src/BRepFeat/BRepFeat_MakeLinearForm.cxx +++ b/src/BRepFeat/BRepFeat_MakeLinearForm.cxx @@ -1198,10 +1198,6 @@ static void MajMap(const TopoDS_Shape& theB, for (exp.Init(theB,TopAbs_EDGE); exp.More(); exp.Next()) { if (!theMap.IsBound(exp.Current())) { -#ifdef DEB - const TopoDS_Edge& e = -#endif - TopoDS::Edge(exp.Current()); TopTools_ListOfShape thelist2; theMap.Bind(exp.Current(), thelist2); theMap(exp.Current()) = theP.Shapes(exp.Current()); diff --git a/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx b/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx index c4cb4522a1..18daa466ae 100755 --- a/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx +++ b/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx @@ -1735,10 +1735,6 @@ static void MajMap(const TopoDS_Shape& theB, for (exp.Init(theB,TopAbs_EDGE); exp.More(); exp.Next()) { if (!theMap.IsBound(exp.Current())) { -#ifdef DEB - const TopoDS_Edge& e = -#endif - TopoDS::Edge(exp.Current()); TopTools_ListOfShape thelist2; theMap.Bind(exp.Current(), thelist2); theMap(exp.Current()) = theP.Shapes(exp.Current()); diff --git a/src/BRepFill/BRepFill_CompatibleWires.cxx b/src/BRepFill/BRepFill_CompatibleWires.cxx index 898325bd78..5233647bff 100755 --- a/src/BRepFill/BRepFill_CompatibleWires.cxx +++ b/src/BRepFill/BRepFill_CompatibleWires.cxx @@ -929,11 +929,6 @@ void BRepFill_CompatibleWires:: // extremity of the first wire V1 = TopoDS::Vertex(SeqV.Value(1)); - // previous wire -#ifdef DEB - const TopoDS_Wire& wire2 = -#endif - TopoDS::Wire(myWork(i-1)); // loop on vertices of wire1 for (ii=1;ii<=SeqV.Length();ii++) { diff --git a/src/BRepFill/BRepFill_OffsetWire.cxx b/src/BRepFill/BRepFill_OffsetWire.cxx index 7c6c8bf8a5..27d2a0c0b9 100755 --- a/src/BRepFill/BRepFill_OffsetWire.cxx +++ b/src/BRepFill/BRepFill_OffsetWire.cxx @@ -533,9 +533,8 @@ void BRepFill_OffsetWire::Perform (const Standard_Real Offset, Handle(Geom_Curve) G3d = BRep_Tool::Curve(TopoDS::Edge(anE),f,l); GeomAdaptor_Curve AC(G3d,f,l); - Standard_Boolean dummy = PerformCurve(Parameters, Points, - AC, aDefl, f, l, Precision::Confusion(), - 2); + PerformCurve(Parameters, Points, AC, aDefl, f, + l, Precision::Confusion(), 2); Standard_Integer NPnts = Points.Length(); if(NPnts > 2) { diff --git a/src/BRepFill/BRepFill_TrimShellCorner.cxx b/src/BRepFill/BRepFill_TrimShellCorner.cxx index 75e1088dd8..984629c090 100755 --- a/src/BRepFill/BRepFill_TrimShellCorner.cxx +++ b/src/BRepFill/BRepFill_TrimShellCorner.cxx @@ -851,7 +851,6 @@ Standard_Boolean SplitUEdges(const Handle(TopTools_HArray2OfShape)& theUEdge const BOPDS_PDS& theDS, TopTools_DataMapOfShapeListOfShape& theHistMap) { - const BOPDS_VectorOfInterfVE& aVEs = theDS->InterfVE(); const BOPDS_VectorOfInterfVV& aVVs = theDS->InterfVV(); BRep_Builder aBB; diff --git a/src/BRepLib/BRepLib_FindSurface.cxx b/src/BRepLib/BRepLib_FindSurface.cxx index e3cfbf01d4..34cfe56fcd 100755 --- a/src/BRepLib/BRepLib_FindSurface.cxx +++ b/src/BRepLib/BRepLib_FindSurface.cxx @@ -210,7 +210,7 @@ void BRepLib_FindSurface::Init(const TopoDS_Shape& S, Standard_Integer i = 0,j; // iterate on the surfaces of the first edge - while ( Standard_True) { + for(;;) { i++; BRep_Tool::CurveOnSurface(E,PC,mySurface,myLocation,f,l,i); if (mySurface.IsNull()) { @@ -220,7 +220,7 @@ void BRepLib_FindSurface::Init(const TopoDS_Shape& S, for (ex.Init(S,TopAbs_EDGE); ex.More(); ex.Next()) { if (!E.IsSame(ex.Current())) { j = 0; - while (Standard_True) { + for(;;) { j++; BRep_Tool::CurveOnSurface(TopoDS::Edge(ex.Current()), PPC,SS,L,ff,ll,j); diff --git a/src/BRepMesh/BRepMesh_Delaun.cxx b/src/BRepMesh/BRepMesh_Delaun.cxx index 4273224cbb..6148b6c70e 100755 --- a/src/BRepMesh/BRepMesh_Delaun.cxx +++ b/src/BRepMesh/BRepMesh_Delaun.cxx @@ -761,7 +761,6 @@ void BRepMesh_Delaun::RemovePivotTriangles( const Standard_Integer theEdgeInfo, GetTriangle( anElemId ).Edges( e[0], e[1], e[2], o[0], o[1], o[2] ); - Standard_Boolean isFind = Standard_False; for ( Standard_Integer anIndex = 0; anIndex < 3; ++anIndex ) { if ( e[anIndex] == anMainEdgeId && o[anIndex] == anIsForward ) @@ -1128,7 +1127,6 @@ void BRepMesh_Delaun::MeshLeftPolygonOf( const Standard_Integer theEdgeIndex, return; Standard_Integer aDeadEdgeId = Abs( aPolygon.Last() ); - const BRepMesh_Edge& aDeadEdge = GetEdge( aDeadEdgeId ); aDealLinks.Add( aDeadEdgeId ); diff --git a/src/BRepMesh/BRepMesh_VertexTool.cxx b/src/BRepMesh/BRepMesh_VertexTool.cxx index d5dc46ad64..f488409a19 100644 --- a/src/BRepMesh/BRepMesh_VertexTool.cxx +++ b/src/BRepMesh/BRepMesh_VertexTool.cxx @@ -169,7 +169,7 @@ const BRepMesh_ListOfInteger& BRepMesh_VertexTool::GetListOfDelNodes() const //======================================================================= Standard_Integer BRepMesh_VertexTool::FindIndex(const BRepMesh_Vertex& theVertex) { - mySelector.SetCurrent(theVertex.Coord()); + mySelector.SetCurrent(theVertex.Coord(), Standard_False); myCellFilter.Inspect (theVertex.Coord(), mySelector); return mySelector.GetCoincidentInd(); } diff --git a/src/BRepOffset/BRepOffset_MakeOffset.cxx b/src/BRepOffset/BRepOffset_MakeOffset.cxx index cb14de6fe4..0a5a42f27b 100755 --- a/src/BRepOffset/BRepOffset_MakeOffset.cxx +++ b/src/BRepOffset/BRepOffset_MakeOffset.cxx @@ -149,16 +149,10 @@ static void DEBVerticesControl (const TopTools_IndexedMapOfShape& NewEdges, Handle(BRepAlgo_AsDes) AsDes) { - Standard_Integer NVP = 0; - Standard_Integer NVM = 0; - Standard_Integer NVN = 0; - TopTools_ListOfShape LVP; - //TopTools_MapIteratorOfMapOfShape it; TopTools_ListIteratorOfListOfShape it1LE ; TopTools_ListIteratorOfListOfShape it2LE ; - //for (it.Initialize(NewEdges) ; it.More(); it.Next()) { Standard_Integer i; for (i = 1; i <= NewEdges.Extent(); i++) { const TopoDS_Edge& NE = TopoDS::Edge(NewEdges(i)); diff --git a/src/BRepOffset/BRepOffset_Offset.cxx b/src/BRepOffset/BRepOffset_Offset.cxx index f38da21a7b..a2893eecad 100755 --- a/src/BRepOffset/BRepOffset_Offset.cxx +++ b/src/BRepOffset/BRepOffset_Offset.cxx @@ -1313,7 +1313,6 @@ void BRepOffset_Offset::Init(const TopoDS_Vertex& Vertex, #endif Standard_Integer NbEdges = 1; for (it.Initialize(LEdge); it.More(); it.Next()) { - const TopoDS_Edge& CurE = TopoDS::Edge(it.Value()); sprintf(name,"EOnSph_%d_%d",NbOFFSET,NbEdges++); #ifdef DRAW DBRep::Set(name, CurE); diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MiddlePath.cxx b/src/BRepOffsetAPI/BRepOffsetAPI_MiddlePath.cxx index e9bcb40f79..b9ae704c08 100644 --- a/src/BRepOffsetAPI/BRepOffsetAPI_MiddlePath.cxx +++ b/src/BRepOffsetAPI/BRepOffsetAPI_MiddlePath.cxx @@ -531,8 +531,6 @@ void BRepOffsetAPI_MiddlePath::Build() E2 = TopoDS::Edge(myPaths((j<=NbPaths)? j : 1)(i)); TopoDS_Edge E12 = TopoDS::Edge(SectionsEdges(i)(j-1)); - //TopoDS_Vertex PrevVertex = TopoDS::Vertex(VerSeq(j-1)); - //TopoDS_Vertex CurVertex = TopoDS::Vertex(VerSeq(j)); TopoDS_Vertex PrevVertex = (E1.IsNull())? TopoDS::Vertex(myPaths(j-1)(i)) : TopExp::LastVertex(E1, Standard_True); TopoDS_Vertex CurVertex = (E2.IsNull())? TopoDS::Vertex(myPaths((j<=NbPaths)? j : 1)(i)) @@ -540,9 +538,7 @@ void BRepOffsetAPI_MiddlePath::Build() TopoDS_Edge ProperEdge; const TopTools_ListOfShape& LE = VEmap.FindFromKey(PrevVertex); - //Temporary - Standard_Integer LenList = LE.Extent(); - /////////// + for (itl.Initialize(LE); itl.More(); itl.Next()) { anEdge = TopoDS::Edge(itl.Value()); @@ -673,7 +669,6 @@ void BRepOffsetAPI_MiddlePath::Build() BRepLib::BuildCurve3d(NewEdge2); Standard_Boolean good_ne = IsValidEdge(NewEdge, theFace); Standard_Boolean good_ne1 = IsValidEdge(NewEdge1, theFace); - Standard_Boolean good_ne2 = IsValidEdge(NewEdge2, theFace); GeomAbs_CurveType type_E1 = TypeOfEdge(E1); GeomAbs_CurveType type_E2 = TypeOfEdge(E2); diff --git a/src/BRepTest/BRepTest_SurfaceCommands.cxx b/src/BRepTest/BRepTest_SurfaceCommands.cxx index 9bbbc7bb22..60961b23a0 100755 --- a/src/BRepTest/BRepTest_SurfaceCommands.cxx +++ b/src/BRepTest/BRepTest_SurfaceCommands.cxx @@ -444,24 +444,6 @@ static Standard_Integer continuity (Draw_Interpretor& , aFind.Perform(); aFind.Dump(); - for (i=1; i<=aFind.NbContigousEdges(); i++) { -#ifdef DEB - const TopoDS_Edge& edge = -#endif - aFind.ContigousEdge(i); - const TopTools_ListOfShape& list = aFind.ContigousEdgeCouple(i); - const TopoDS_Edge& sec1 = TopoDS::Edge(list.First()); - const TopoDS_Edge& sec2 = TopoDS::Edge(list.Last()); -#ifdef DEB - const TopoDS_Edge& bound1 = -#endif - aFind.SectionToBoundary(sec1); -#ifdef DEB - const TopoDS_Edge& bound2 = -#endif - aFind.SectionToBoundary(sec2); - } - return 0; } diff --git a/src/BiTgte/BiTgte_Blend.cxx b/src/BiTgte/BiTgte_Blend.cxx index 1cafb07758..860527d30d 100755 --- a/src/BiTgte/BiTgte_Blend.cxx +++ b/src/BiTgte/BiTgte_Blend.cxx @@ -485,7 +485,7 @@ static void Touched(const BRepOffset_Analyse& Analyse, TopTools_MapOfShape& TouchedByCork) { // currently nothing is done !! - if ( Standard_True) { + /*if ( Standard_True) { return; } else { @@ -497,7 +497,8 @@ static void Touched(const BRepOffset_Analyse& Analyse, else if (StopFaces.Contains(L.Last())) TouchedByCork.Add(L.First()); } - } + }*/ + return; } //======================================================================= diff --git a/src/BndLib/BndLib_AddSurface.cxx b/src/BndLib/BndLib_AddSurface.cxx index 0721007dc4..6be1cfa709 100755 --- a/src/BndLib/BndLib_AddSurface.cxx +++ b/src/BndLib/BndLib_AddSurface.cxx @@ -153,8 +153,6 @@ static void TreatInfinitePlane(const gp_Pln &aPlane, { // Get 3 coordinate axes of the plane. const gp_Dir &aNorm = aPlane.Axis().Direction(); - const gp_Dir &aXDir = aPlane.XAxis().Direction(); - const gp_Dir &aYDir = aPlane.YAxis().Direction(); const Standard_Real anAngularTol = RealEpsilon(); // Get location of the plane as its barycenter diff --git a/src/ChFi3d/ChFi3d_Builder_0.cxx b/src/ChFi3d/ChFi3d_Builder_0.cxx index 7a6a48a972..0ce56466e5 100755 --- a/src/ChFi3d/ChFi3d_Builder_0.cxx +++ b/src/ChFi3d/ChFi3d_Builder_0.cxx @@ -3301,7 +3301,7 @@ Standard_Boolean ChFi3d_ComputeCurves(Handle(Adaptor3d_HSurface)& S1, // At this stage : // classic intersections have failed, the path is approached in vain. // Standard_Real Step = 0.1; - while(1) { + for(;;) { //Attention the parameters of arrow for the path and //the tolerance for the approximation can't be taken as those of the //Builder, so they are reestimated as much as possible. diff --git a/src/ChFi3d/ChFi3d_Builder_6.cxx b/src/ChFi3d/ChFi3d_Builder_6.cxx index 8a950f66ac..20bec9e27c 100755 --- a/src/ChFi3d/ChFi3d_Builder_6.cxx +++ b/src/ChFi3d/ChFi3d_Builder_6.cxx @@ -851,7 +851,7 @@ Standard_Boolean ChFi3d_Builder::StoreData(Handle(ChFiDS_SurfData)& Data, Standard_Real aDelta = VLast - VFirst; Standard_Integer aDenom = 2; - while (Standard_True) { + for(;;) { Standard_Real aDeltav = aDelta/aDenom; Standard_Real aParam = VFirst + aDeltav; gp_Pnt2d PUV = PCurveOnFace->Value(aParam); diff --git a/src/DDataStd/DDataStd_BasicCommands.cxx b/src/DDataStd/DDataStd_BasicCommands.cxx index b2a763cccf..8a18ac3b28 100755 --- a/src/DDataStd/DDataStd_BasicCommands.cxx +++ b/src/DDataStd/DDataStd_BasicCommands.cxx @@ -960,7 +960,6 @@ static Standard_Integer DDataStd_GetExtStringArray (Draw_Interpretor& di, } for(Standard_Integer i = A->Lower(); i<=A->Upper(); i++){ - const TCollection_ExtendedString& anExtendedString = A->Value(i); TCollection_AsciiString anAsciiString(A->Value(i),'?'); di << anAsciiString.ToCString(); if(iUpper()) @@ -1188,7 +1187,6 @@ static Standard_Integer DDataStd_SetBooleanArray (Draw_Interpretor& di, TDF_Label label; DDF::AddLabel(DF, arg[2], label); - Standard_Integer isDelta = Draw::Atoi(arg[3]); Standard_Integer From = Draw::Atoi(arg[4]), To = Draw::Atoi( arg[5] ), j; di << "Array of Standard_Boolean with bounds from = " << From << " to = " << To << "\n"; Handle(TDataStd_BooleanArray) A = TDataStd_BooleanArray::Set(label, From, To); diff --git a/src/DDataStd/DDataStd_Sample.cxx b/src/DDataStd/DDataStd_Sample.cxx index 187145b1b9..26fac1329c 100755 --- a/src/DDataStd/DDataStd_Sample.cxx +++ b/src/DDataStd/DDataStd_Sample.cxx @@ -98,10 +98,6 @@ static void Sample() realarray->SetValue(j, M_PI * j); } - // Getting length of array - - Standard_Integer length = realarray->Length(); - // Retrieving value by index Standard_Real value = realarray->Value(3); @@ -346,7 +342,6 @@ static void Sample() Handle(TDataStd_Real) valOfdistance = constraint->GetValue(); - Standard_Real distance = valOfdistance->Get(); } // Setting PARALLEL constraint between NS1 and NS2 diff --git a/src/DNaming/DNaming_BooleanOperationDriver.cxx b/src/DNaming/DNaming_BooleanOperationDriver.cxx index 3d4cd1a088..bbc5b20572 100644 --- a/src/DNaming/DNaming_BooleanOperationDriver.cxx +++ b/src/DNaming/DNaming_BooleanOperationDriver.cxx @@ -351,7 +351,6 @@ Standard_Boolean DNaming_BooleanOperationDriver::CheckAndLoad if(!aCheck.IsValid(theMkOpe.Shape())) aResIsValid = FixSameParameter(theMkOpe.Shape(), aCheck); if (aResIsValid) { - const TDF_Label& aResultLabel = RESPOSITION(theFunction); if(theFunction->GetDriverGUID() == FUSE_GUID) { LoadNamingDS(RESPOSITION(theFunction), theMkOpe); } diff --git a/src/DPrsStd/DPrsStd_Sample.cxx b/src/DPrsStd/DPrsStd_Sample.cxx index 97ef2d4699..28ab62447b 100755 --- a/src/DPrsStd/DPrsStd_Sample.cxx +++ b/src/DPrsStd/DPrsStd_Sample.cxx @@ -179,12 +179,6 @@ static void Sample() //Presentation of the attribute is erased //from viewer and removed from AIS_InteractiveContext - //Checking if attribute is displayed in viewer - - if( ShapeLabel.FindAttribute(TPrsStd_AISPresentation::GetID(), PRS) ) - Standard_Boolean isDisplayed = PRS->IsDisplayed(); - - Handle(TPrsStd_AISPresentation) P; if( ShapeLabel.FindAttribute(TPrsStd_AISPresentation::GetID(), P) ) { diff --git a/src/Draw/Draw_BasicCommands.cxx b/src/Draw/Draw_BasicCommands.cxx index a7355b2284..219b3af098 100755 --- a/src/Draw/Draw_BasicCommands.cxx +++ b/src/Draw/Draw_BasicCommands.cxx @@ -405,7 +405,7 @@ static Standard_Integer Draw_wait(Draw_Interpretor& , Standard_Integer n, const static unsigned int __stdcall CpuFunc (void * param) { clock_t aCurrent; - while (1) + for(;;) { Sleep (5); Standard_Real anUserSeconds, aSystemSeconds; diff --git a/src/Draw/Draw_VariableCommands.cxx b/src/Draw/Draw_VariableCommands.cxx index da2144d751..d9a669f796 100755 --- a/src/Draw/Draw_VariableCommands.cxx +++ b/src/Draw/Draw_VariableCommands.cxx @@ -1110,7 +1110,7 @@ static Standard_Real ParseFactor(char*& name) { Standard_Real x = ParseValue(name); - while (1) { + for(;;) { char c = *name; if (c == '\0') return x; name++; @@ -1136,7 +1136,7 @@ static Standard_Real Parse(char*& name) { Standard_Real x = ParseFactor(name); - while (1) { + for(;;) { char c = *name; if (c == '\0') return x; name++; diff --git a/src/Draw/Draw_Window.cxx b/src/Draw/Draw_Window.cxx index 397cfc83bc..af3c79638e 100755 --- a/src/Draw/Draw_Window.cxx +++ b/src/Draw/Draw_Window.cxx @@ -1725,7 +1725,6 @@ void DrawWindow::Clear() HDC hDC = GetDC(win); HDC aWorkDC = myUseBuffer ? GetMemDC(hDC) : hDC; - int debug = GetROP2(aWorkDC); SaveDC(aWorkDC); SelectObject(aWorkDC,GetStockObject(BLACK_PEN)); Rectangle(aWorkDC, 0, 0, WidthWin(), HeightWin()); @@ -2048,7 +2047,7 @@ static DWORD WINAPI readStdinThreadFunc(VOID) { if (!Draw_IsConsoleSubsystem) return 1; - while (1) { + for(;;) { while (console_semaphore != WAIT_CONSOLE_COMMAND) Sleep(100); //if (gets(console_command)) diff --git a/src/Extrema/Extrema_FuncExtPS.cxx b/src/Extrema/Extrema_FuncExtPS.cxx index 9af49fbdba..f80d35e8d8 100755 --- a/src/Extrema/Extrema_FuncExtPS.cxx +++ b/src/Extrema/Extrema_FuncExtPS.cxx @@ -41,7 +41,6 @@ Extrema_FuncExtPS::Extrema_FuncExtPS (const gp_Pnt& P, { myP = P; myS = (Adaptor3d_SurfacePtr)&S; - GeomAbs_SurfaceType aSType = S.GetType(); myPinit = Standard_True; mySinit = Standard_True; } @@ -50,7 +49,6 @@ Extrema_FuncExtPS::Extrema_FuncExtPS (const gp_Pnt& P, void Extrema_FuncExtPS::Initialize(const Adaptor3d_Surface& S) { myS = (Adaptor3d_SurfacePtr)&S; - GeomAbs_SurfaceType aSType = S.GetType(); mySinit = Standard_True; myPoint.Clear(); mySqDist.Clear(); diff --git a/src/Extrema/Extrema_GenExtPS.cxx b/src/Extrema/Extrema_GenExtPS.cxx index 98a4fc4e73..49f97c4aa2 100755 --- a/src/Extrema/Extrema_GenExtPS.cxx +++ b/src/Extrema/Extrema_GenExtPS.cxx @@ -496,7 +496,6 @@ void Extrema_GenExtPS::GetGridPoints( const Adaptor3d_Surface& theSurf) { Handle(TColStd_HArray1OfReal) anArrKnots; Standard_Integer aDegree = 0; - GeomAbs_CurveType aType = theSurf.BasisCurve()->Curve().GetType(); if(theSurf.BasisCurve()->Curve().GetType() == GeomAbs_BSplineCurve) { Handle(Geom_BSplineCurve) aBspl = theSurf.BasisCurve()->Curve().BSpline(); @@ -810,14 +809,10 @@ void Extrema_GenExtPS::FindSolution(const gp_Pnt& P, math_Vector errors(1,2); math_Vector root(1, 2); - Standard_Real eps = 1.e-9; - Standard_Integer nbsubsample = 11; Standard_Integer aNbMaxIter = 100; gp_Pnt PStart = theParams.Value(); - Standard_Real DistStart = theParams.GetSqrDistance(); - Standard_Real DistSol = DistStart; math_FunctionSetRoot S (myF,UV,Tol,UVinf,UVsup, aNbMaxIter); @@ -962,7 +957,7 @@ void Extrema_GenExtPS::Perform(const gp_Pnt& P) Bnd_SphereUBTreeSelectorMin aSelector(mySphereArray, aSol); //aSelector.SetMaxDist( RealLast() ); aSelector.DefineCheckPoint( P ); - Standard_Integer aNbSel = mySphereUBTree->Select( aSelector ); + mySphereUBTree->Select( aSelector ); //TODO: check if no solution in binary tree Bnd_Sphere& aSph = aSelector.Sphere(); Standard_Real aU = myUParams->Value(aSph.U()); @@ -979,13 +974,12 @@ void Extrema_GenExtPS::Perform(const gp_Pnt& P) Bnd_SphereUBTreeSelectorMax aSelector(mySphereArray, aSol); //aSelector.SetMaxDist( RealLast() ); aSelector.DefineCheckPoint( P ); - Standard_Integer aNbSel = mySphereUBTree->Select( aSelector ); + mySphereUBTree->Select( aSelector ); //TODO: check if no solution in binary tree Bnd_Sphere& aSph = aSelector.Sphere(); Standard_Real aU = myUParams->Value(aSph.U()); Standard_Real aV = myVParams->Value(aSph.V()); Extrema_POnSurfParams aParams(aU, aV, myS->Value(aU, aV)); - aParams.SetSqrDistance(P.SquareDistance(aParams.Value())); aParams.SetIndices(aSph.U(), aSph.V()); diff --git a/src/FSD/FSD_CmpFile.cxx b/src/FSD/FSD_CmpFile.cxx index 7dea71241d..3111e44ad0 100755 --- a/src/FSD/FSD_CmpFile.cxx +++ b/src/FSD/FSD_CmpFile.cxx @@ -392,7 +392,7 @@ void FSD_CmpFile::ReadString(TCollection_AsciiString& buffer) void FSD_CmpFile::ReadWord(TCollection_AsciiString& buffer) { - char c; + char c = '\0'; char b[8193],*tmpb; Standard_Boolean IsEnd = Standard_False; Standard_Integer i; @@ -1394,5 +1394,4 @@ Storage_Position FSD_CmpFile::Tell() } default: return -1; } - return -1; } diff --git a/src/FSD/FSD_File.cxx b/src/FSD/FSD_File.cxx index d755d6f509..33c320c919 100755 --- a/src/FSD/FSD_File.cxx +++ b/src/FSD/FSD_File.cxx @@ -326,7 +326,7 @@ void FSD_File::ReadString(TCollection_AsciiString& buffer) void FSD_File::ReadWord(TCollection_AsciiString& buffer) { - char c; + char c = '\0'; char b[8193],*tmpb; Standard_Boolean IsEnd = Standard_False; Standard_Integer i; @@ -1368,5 +1368,4 @@ Storage_Position FSD_File::Tell() } default: return -1; } - return -1; } diff --git a/src/FWOSDriver/FWOSDriver_Driver.cxx b/src/FWOSDriver/FWOSDriver_Driver.cxx index 868613f9e5..4e19908b5b 100755 --- a/src/FWOSDriver/FWOSDriver_Driver.cxx +++ b/src/FWOSDriver/FWOSDriver_Driver.cxx @@ -94,7 +94,6 @@ Standard_Boolean FWOSDriver_Driver::HasReadPermission(const TCollection_Extended default: return Standard_False; } - return Standard_False; } //============================================================================== diff --git a/src/GeomFill/GeomFill_NSections.cxx b/src/GeomFill/GeomFill_NSections.cxx index 98a1f33ea0..19f4ddbf4d 100755 --- a/src/GeomFill/GeomFill_NSections.cxx +++ b/src/GeomFill/GeomFill_NSections.cxx @@ -528,8 +528,6 @@ GeomFill_NSections::GeomFill_NSections(const TColGeom_SequenceOfCurve& NC, Handle(Geom_TrimmedCurve) curvTrim; Handle(Geom_BSplineCurve) curvBS, curvBS1; Handle(Geom_Curve) curv = mySections(1); - Standard_Real first = curv->FirstParameter(), - last = curv->LastParameter(); for (j=jdeb; j<=jfin; j++) { diff --git a/src/GeometryTest/GeometryTest_CurveCommands.cxx b/src/GeometryTest/GeometryTest_CurveCommands.cxx index c130e0ff23..aa41e343ba 100755 --- a/src/GeometryTest/GeometryTest_CurveCommands.cxx +++ b/src/GeometryTest/GeometryTest_CurveCommands.cxx @@ -847,7 +847,6 @@ static void ComputeDeviation(const Handle(Geom_Curve)& theCurve, theUfMax = 0.; theUlMax = 0.; theImax = 0; - Standard_Real ufmax = 0., ulmax = 0.; //take knots Standard_Integer nbp = thePnts->NbKnots(); diff --git a/src/HLRTopoBRep/HLRTopoBRep_OutLiner.cxx b/src/HLRTopoBRep/HLRTopoBRep_OutLiner.cxx index 252bee79c9..8f67e980fa 100755 --- a/src/HLRTopoBRep/HLRTopoBRep_OutLiner.cxx +++ b/src/HLRTopoBRep/HLRTopoBRep_OutLiner.cxx @@ -152,9 +152,7 @@ void HLRTopoBRep_OutLiner::ProcessFace(const TopoDS_Face& F, B.Add(NF,W); // add the new wire in the new face. } //} - - - TopTools_ListOfShape& IntL = myDS.AddIntL(F); + myDS.AddIntL(F); TopTools_ListOfShape& OutL = myDS.AddOutL(F); if (myDS.FaceHasIntL(F)) { // get the InternalOutLines on face F diff --git a/src/IFSelect/IFSelect_SessionFile.cxx b/src/IFSelect/IFSelect_SessionFile.cxx index b0eaa9488b..3c2be1874b 100755 --- a/src/IFSelect/IFSelect_SessionFile.cxx +++ b/src/IFSelect/IFSelect_SessionFile.cxx @@ -114,7 +114,7 @@ static int deja = 0; // read mode : lire les lignes // On charge le fichier dans "thelist" Standard_Boolean header = Standard_False; - while (1) { + for(;;) { ligne[0] = '\0'; fgets(ligne,200,lefic); if (feof(lefic)) break; diff --git a/src/IGESFile/igesread.c b/src/IGESFile/igesread.c index 85a515a77a..4b00b23e64 100755 --- a/src/IGESFile/igesread.c +++ b/src/IGESFile/igesread.c @@ -71,7 +71,7 @@ char* nomfic; int lesect[6]; int modefnes; if (lefic == NULL) return -1; /* fichier pas pu etre ouvert */ for (i = 1; i < 6; i++) lesect[i] = 0; for (j = 0; j < 100; j++) ligne[j] = 0; - while (1) { + for(;;) { numl ++; i = iges_lire(lefic,&numsec,ligne,modefnes); if (i <= 0) { diff --git a/src/IntAna/IntAna_Curve.cxx b/src/IntAna/IntAna_Curve.cxx index d356438de8..dcabde6254 100755 --- a/src/IntAna/IntAna_Curve.cxx +++ b/src/IntAna/IntAna_Curve.cxx @@ -566,7 +566,6 @@ default: return(gp_Pnt(0.0,0.0,0.0)); } - return(gp_Pnt(0.0,0.0,0.0)); } // diff --git a/src/IntPatch/IntPatch_ALineToWLine.cxx b/src/IntPatch/IntPatch_ALineToWLine.cxx index 0e4cc6711e..6d2f87951a 100755 --- a/src/IntPatch/IntPatch_ALineToWLine.cxx +++ b/src/IntPatch/IntPatch_ALineToWLine.cxx @@ -893,7 +893,7 @@ gp_Pnt DefineDU(const Handle(IntPatch_ALine)& aline, gp_Pnt P1 = aline->Value(U), P2, P3; gp_Vec V13, V12, V23; Standard_Real dU = DU/2.0, curvDef, angDef, m1, m2, m3; - do{ //According to class TangentialDeflection from GCPnts + for(;;) { //According to class TangentialDeflection from GCPnts P2=aline->Value(U+dU); P3=aline->Value(U+DU); V13 = P3.XYZ().Subtracted(P1.XYZ()); m1 = V13.Magnitude(); V12 = P2.XYZ().Subtracted(P1.XYZ()); m2 = V12.Magnitude(); @@ -903,7 +903,7 @@ gp_Pnt DefineDU(const Handle(IntPatch_ALine)& aline, angDef = Abs(V13.Angle(V23)); if(curvDef < CurvDef && angDef < AngDef) break; DU = dU; dU /= 2.0; - }while(1); + } return P3; } //======================================================================= diff --git a/src/IntPatch/IntPatch_PrmPrmIntersection.cxx b/src/IntPatch/IntPatch_PrmPrmIntersection.cxx index 59bd2d9659..68a7c36234 100755 --- a/src/IntPatch/IntPatch_PrmPrmIntersection.cxx +++ b/src/IntPatch/IntPatch_PrmPrmIntersection.cxx @@ -149,7 +149,6 @@ void IntPatch_PrmPrmIntersection::Perform (const Handle(Adaptor3d_HSurface)& done = Standard_True; SLin.Clear(); - Standard_Real Deflection2 = Deflection*Deflection; Standard_Integer nbLigSec = Interference.NbSectionLines(); Standard_Integer nbTanZon = Interference.NbTangentZones(); @@ -1326,12 +1325,10 @@ void IntPatch_PrmPrmIntersection::Perform (const Handle(Adaptor3d_HSurface)& if(U2aYL) { aA=aXL; aXL=aXP; diff --git a/src/IntTools/IntTools_BeanFaceIntersector.cxx b/src/IntTools/IntTools_BeanFaceIntersector.cxx index 8023599b10..975e5e077f 100755 --- a/src/IntTools/IntTools_BeanFaceIntersector.cxx +++ b/src/IntTools/IntTools_BeanFaceIntersector.cxx @@ -898,7 +898,6 @@ Standard_Integer IntTools_BeanFaceIntersector::FastComputeExactIntersection() aTolang2=1.e-16; aLin=myCurve.Line(); const gp_Dir& aDirL=aLin.Direction(); - const gp_Pnt& aLocL=aLin.Location(); // aCos=aDirC.Dot(aDirL); if(aCos >= 0.) { diff --git a/src/IntTools/IntTools_EdgeEdge.cxx b/src/IntTools/IntTools_EdgeEdge.cxx index a6802eb73b..3a81a85dbc 100755 --- a/src/IntTools/IntTools_EdgeEdge.cxx +++ b/src/IntTools/IntTools_EdgeEdge.cxx @@ -585,7 +585,7 @@ IntTools_EdgeEdge::IntTools_EdgeEdge() Standard_Integer step = 1, stepcheck = 1000, steplimit = 100000; Standard_Real value = (IP==1) ? DistanceFunction(0.5*(a+b)) : DerivativeFunction(0.5*(a+b)); - while (1) { + for(;;) { x0=.5*(a+b); if (IP==1) diff --git a/src/IntTools/IntTools_EdgeEdge_1.cxx b/src/IntTools/IntTools_EdgeEdge_1.cxx index 53ef989f3f..d184d4f498 100644 --- a/src/IntTools/IntTools_EdgeEdge_1.cxx +++ b/src/IntTools/IntTools_EdgeEdge_1.cxx @@ -323,7 +323,7 @@ void IntTools_ComparatorCurve::GetCurveBase(const Handle(Geom_Curve)& aC3D, return; } // - while(1) { + for(;;) { iTrimmed=0; iOffset=0; aCT3D=Handle(Geom_TrimmedCurve)::DownCast(aC3DB); @@ -795,7 +795,7 @@ void IntTools_DistCC::FindMaxLocal(const Standard_Real aT11, return; } // - while(1) { + for(;;) { if (fabs(aA-aB)GetElement(); const LDOM_BasicNode * aLastChild = NULL; - while (1) { + for(;;) { LDOM_Node::NodeType aLocType; LDOMBasicString aTextValue; char *aTextStr; diff --git a/src/LDOM/LDOM_CharReference.cxx b/src/LDOM/LDOM_CharReference.cxx index 7a41f59436..9f74c1389e 100755 --- a/src/LDOM/LDOM_CharReference.cxx +++ b/src/LDOM/LDOM_CharReference.cxx @@ -54,7 +54,7 @@ char * LDOM_CharReference::Decode (char * theSrc, Standard_Integer& theLen) char * aSrcPtr = theSrc, * aDstPtr = theSrc; Standard_Integer anIncrCount = 0; - while (1) { + for(;;) { char * aPtr = strchr (aSrcPtr, '&'); if (aPtr == NULL) { // End of the loop @@ -152,7 +152,7 @@ char * LDOM_CharReference::Encode (const char* theSrc, Standard_Integer& theLen, char * aDest = (char *) theSrc; Standard_Integer aCount = 0; // Analyse if there is a non-standard character in the string - while (1) { + for(;;) { const unsigned int iSrc = (const unsigned int) * (const unsigned char *) ptrSrc; if (iSrc == 0) { diff --git a/src/LDOM/LDOM_Element.cxx b/src/LDOM/LDOM_Element.cxx index 2682de3a9b..9d059db7cc 100755 --- a/src/LDOM/LDOM_Element.cxx +++ b/src/LDOM/LDOM_Element.cxx @@ -48,7 +48,7 @@ LDOMString LDOM_Element::getAttribute (const LDOMString& aName) const if (myLastChild == NULL) { const LDOM_BasicNode * aNode = anElem.GetFirstChild(); if (aNode && aNode -> getNodeType () != LDOM_Node::ATTRIBUTE_NODE) - while (1) { + for(;;) { const LDOM_BasicNode * aSibling = aNode -> GetSibling(); if (aSibling == NULL) return LDOMString (); @@ -77,7 +77,7 @@ LDOM_Attr LDOM_Element::getAttributeNode (const LDOMString& aName) const if (myLastChild == NULL) { const LDOM_BasicNode * aNode = anElem.GetFirstChild(); if (aNode && aNode -> getNodeType () != LDOM_Node::ATTRIBUTE_NODE) - while (1) { + for(;;) { const LDOM_BasicNode * aSibling = aNode -> GetSibling(); if (aSibling == NULL) return LDOM_Attr (); diff --git a/src/LDOM/LDOM_XmlReader.cxx b/src/LDOM/LDOM_XmlReader.cxx index b009073f1e..5a274aa2aa 100755 --- a/src/LDOM/LDOM_XmlReader.cxx +++ b/src/LDOM/LDOM_XmlReader.cxx @@ -116,7 +116,7 @@ LDOM_XmlReader::RecordType LDOM_XmlReader::ReadRecord LDOMBasicString anAttrName, anAttrValue; char anAttDelimiter = '\0'; - while (1) { + for(;;) { // Check if the current file buffer is exhausted // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // There should always be some bytes available in the buffer for analysis @@ -293,7 +293,7 @@ LDOM_XmlReader::RecordType LDOM_XmlReader::ReadRecord // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ case STATE_COMMENT: aPtr = aStartData; - while (1) { + for(;;) { aPtr = (const char *) memchr (aPtr, '-', (myEndPtr - 2) - aPtr); if (aPtr == NULL) break; if (aPtr[1] != '-') ++ aPtr; @@ -327,7 +327,7 @@ LDOM_XmlReader::RecordType LDOM_XmlReader::ReadRecord // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ case STATE_CDATA: aPtr = aStartData; - while (1) { + for(;;) { aPtr = (const char *) memchr (aPtr, ']', (myEndPtr - 1) - aStartData); if (aPtr == NULL) break; if (aPtr[1] != ']') { // ERROR @@ -530,7 +530,7 @@ static Standard_Boolean isName (const char * aString, const char *& aNameEnd) { Standard_Boolean aResult; - int aCh = aString[0]; + char aCh = aString[0]; if (IsAlphabetic(aCh) || aCh == '_' || aCh == ':') { const char * aPtr = &aString[1]; while (aPtr < aStringEnd) { diff --git a/src/Message/Message_MsgFile.cxx b/src/Message/Message_MsgFile.cxx index 4eb0aafea1..6e679720f6 100755 --- a/src/Message/Message_MsgFile.cxx +++ b/src/Message/Message_MsgFile.cxx @@ -99,7 +99,7 @@ getString (_Char *& thePtr, // Skip whitespaces in the beginning of the string aPtr = anEndPtr; aLeftSpaces = 0; - while (1) + for (;;) { _Char aChar = * aPtr; if (aChar == ' ') aLeftSpaces++; diff --git a/src/NCollection/NCollection_IncAllocator.cxx b/src/NCollection/NCollection_IncAllocator.cxx index 107a77ae77..2b4de4427e 100755 --- a/src/NCollection/NCollection_IncAllocator.cxx +++ b/src/NCollection/NCollection_IncAllocator.cxx @@ -44,6 +44,8 @@ namespace #define IMEM_FREE(p_bl) (size_t(p_bl->p_end_block - p_bl->p_free_space)) + // auxiliary dummy function used to get a place where break point can be set + inline void place_for_breakpoint() {} }; #define MaxLookup 16 @@ -82,6 +84,8 @@ Standard_EXPORT void IncAllocator_SetDebugFlag(const Standard_Boolean theDebug) IS_DEBUG = theDebug; } +#ifdef DEB + //======================================================================= /** * Static value of the current allocation ID. It provides unique @@ -102,12 +106,9 @@ static void Debug_Create(Standard_Address theAlloc) aMutex.Lock(); StorageIDMap().Bind(theAlloc, ++CurrentID); StorageIDSet().Add(CurrentID); - aMutex.Unlock(); if (CurrentID == CATCH_ID) - { - // Place for break point for creation of investigated allocator - int a = 1; - } + place_for_breakpoint(); + aMutex.Unlock(); } //======================================================================= @@ -128,6 +129,8 @@ static void Debug_Destroy(Standard_Address theAlloc) aMutex.Unlock(); } +#endif /* DEB */ + //======================================================================= //function : IncAllocator_PrintAlive //purpose : Outputs the alive numbers to the file inc_alive.d diff --git a/src/OSD/OSD.cxx b/src/OSD/OSD.cxx index 26de1363b7..a6a913de8c 100755 --- a/src/OSD/OSD.cxx +++ b/src/OSD/OSD.cxx @@ -42,7 +42,8 @@ Standard_Boolean OSD::RealToCString(const Standard_Real aReal, // Suppress "e+00" and unsignificant 0's - if ((p = strchr(aString,'e'))) { + p = strchr(aString,'e'); + if (p) { if (!strcmp(p,"e+00")) *p = 0 ; for (q = p-1 ; *q == '0' ; q--) ; diff --git a/src/OSD/OSD_DirectoryIterator.cxx b/src/OSD/OSD_DirectoryIterator.cxx index d2f0c74ce3..7a254565d0 100755 --- a/src/OSD/OSD_DirectoryIterator.cxx +++ b/src/OSD/OSD_DirectoryIterator.cxx @@ -327,7 +327,7 @@ Standard_Integer OSD_DirectoryIterator :: Error () const { OSD_DirectoryIterator::OSD_DirectoryIterator() {} void OSD_DirectoryIterator::Initialize( - const OSD_Path& where, - const TCollection_AsciiString& Mask){} + const OSD_Path& /*where*/, + const TCollection_AsciiString& /*Mask*/){} #endif diff --git a/src/OSD/OSD_Disk.cxx b/src/OSD/OSD_Disk.cxx index cf73a48fea..0de301fe6f 100755 --- a/src/OSD/OSD_Disk.cxx +++ b/src/OSD/OSD_Disk.cxx @@ -329,7 +329,7 @@ Standard_Integer OSD_Disk :: DiskQuota () { } // end OSD_Disk :: DiskQuota -void OSD_Disk :: SetDiskQuota ( const Standard_Integer QuotaSize ) { +void OSD_Disk :: SetDiskQuota ( const Standard_Integer /*QuotaSize*/ ) { SetLastError ( ( DWORD )STG_E_UNIMPLEMENTEDFUNCTION ); diff --git a/src/OSD/OSD_File.cxx b/src/OSD/OSD_File.cxx index bbbbc71c74..23a187b289 100755 --- a/src/OSD/OSD_File.cxx +++ b/src/OSD/OSD_File.cxx @@ -960,9 +960,8 @@ void OSD_File :: Build ( // Open a file // --------------------------------------------------------------------- -void OSD_File :: Open ( - const OSD_OpenMode Mode, const OSD_Protection& Protect - ) { +void OSD_File :: Open (const OSD_OpenMode Mode, const OSD_Protection& /*Protect*/) +{ TCollection_AsciiString fName; @@ -1516,7 +1515,7 @@ void OSD_File :: Seek ( const Standard_Integer Offset, const OSD_FromWhere Whence ) { - DWORD dwMoveMethod; + DWORD dwMoveMethod = 0; TEST_RAISE( TEXT( "Seek" ) ); @@ -1940,7 +1939,7 @@ PSECURITY_DESCRIPTOR __fastcall _osd_wnt_protection_to_sd ( PTOKEN_OWNER pTkOwner = NULL; PTOKEN_GROUPS pTkGroups = NULL; PTOKEN_PRIMARY_GROUP pTkPrimaryGroup = NULL; - PSECURITY_DESCRIPTOR retVal; + PSECURITY_DESCRIPTOR retVal = NULL; PSECURITY_DESCRIPTOR pfSD = NULL; BOOL fDummy; PFILE_ACE pFileACE; @@ -2388,7 +2387,7 @@ static int __fastcall _get_buffer ( static DWORD __fastcall _get_access_mask ( OSD_SingleProtection prt ) { - DWORD retVal; + DWORD retVal = 0; switch ( prt ) { @@ -2500,7 +2499,7 @@ static DWORD __fastcall _get_access_mask ( OSD_SingleProtection prt ) { static DWORD __fastcall _get_dir_access_mask ( OSD_SingleProtection prt ) { - DWORD retVal; + DWORD retVal = 0; switch ( prt ) { @@ -2617,7 +2616,7 @@ static HANDLE __fastcall _open_file ( ) { HANDLE retVal = INVALID_HANDLE_VALUE; - DWORD dwDesiredAccess; + DWORD dwDesiredAccess = 0; DWORD dwCreationDistribution; switch ( oMode ) { @@ -2680,7 +2679,7 @@ Standard_Integer __fastcall _get_file_type ( Standard_CString fName, Standard_Integer fileHandle ) { - Standard_Integer retVal; + Standard_Integer retVal = 0; DWORD dwType; int fileType; @@ -3049,9 +3048,9 @@ static OSD_SingleProtection __fastcall _get_protection_dir ( DWORD mask ) { BOOL __fastcall _osd_print (const Standard_PCharacter pName, Standard_CString fName ) { BOOL fOK, fJob; - HANDLE hPrinter; + HANDLE hPrinter = NULL; BYTE jobInfo[ MAX_PATH + sizeof ( DWORD ) ]; - DWORD dwNeeded, dwCode; + DWORD dwNeeded, dwCode = 0; fOK = fJob = FALSE; @@ -3187,7 +3186,7 @@ Standard_Boolean OSD_File::ReadLastLine(TCollection_AsciiString& aLine,const Sta if (Count <= 0) return Standard_False ; - while(1) { + for(;;) { ReadLine(aLine, MaxLength, Len) ; if (!aLine.IsEmpty()) return Standard_True ; diff --git a/src/OSD/OSD_FileIterator.cxx b/src/OSD/OSD_FileIterator.cxx index aed1864c62..a36a7b76eb 100755 --- a/src/OSD/OSD_FileIterator.cxx +++ b/src/OSD/OSD_FileIterator.cxx @@ -411,7 +411,7 @@ Standard_Integer OSD_FileIterator :: Error () const { OSD_FileIterator::OSD_FileIterator() {} void OSD_FileIterator::Initialize( - const OSD_Path& where, - const TCollection_AsciiString& Mask){} + const OSD_Path& /*where*/, + const TCollection_AsciiString& /*Mask*/){} #endif diff --git a/src/OSD/OSD_FileNode.cxx b/src/OSD/OSD_FileNode.cxx index 0f4870353a..4ba95e934c 100755 --- a/src/OSD/OSD_FileNode.cxx +++ b/src/OSD/OSD_FileNode.cxx @@ -851,7 +851,7 @@ Quantity_Date OSD_FileNode::CreationMoment () { Standard_Integer OSD_FileNode::UserId () { PSID pSIDowner = NULL; - PSID retVal; + PSID retVal = NULL; BOOL fDefaulted; TCollection_AsciiString fName; PSECURITY_DESCRIPTOR pSD; @@ -1002,7 +1002,7 @@ static BOOL __fastcall _get_file_time ( FILETIME ftCreationTime; FILETIME ftLastWriteTime; LPFILETIME lpftPtr; - HANDLE hFile; + HANDLE hFile = INVALID_HANDLE_VALUE; __try { diff --git a/src/OSD/OSD_Host.cxx b/src/OSD/OSD_Host.cxx index 5fb092552e..cb420d2a45 100755 --- a/src/OSD/OSD_Host.cxx +++ b/src/OSD/OSD_Host.cxx @@ -246,7 +246,7 @@ OSD_Host :: OSD_Host () { DWORD nSize; Standard_Character szHostName[ MAX_COMPUTERNAME_LENGTH + 1 ]; - char* hostAddr; + char* hostAddr = 0; MEMORYSTATUS ms; WSADATA wd; PHOSTENT phe; @@ -258,6 +258,7 @@ OSD_Host :: OSD_Host () { nSize = MAX_COMPUTERNAME_LENGTH + 1; osVerInfo.dwOSVersionInfoSize = sizeof ( OSVERSIONINFO ); + ZeroMemory (&ms, sizeof(ms)); ZeroMemory ( szHostName, sizeof ( Standard_Character ) * (MAX_COMPUTERNAME_LENGTH + 1) ); if ( !GetVersionEx ( &osVerInfo ) ) { diff --git a/src/OSD/OSD_MAllocHook.cxx b/src/OSD/OSD_MAllocHook.cxx index 3ce94e6ae4..517ed6d604 100755 --- a/src/OSD/OSD_MAllocHook.cxx +++ b/src/OSD/OSD_MAllocHook.cxx @@ -39,6 +39,11 @@ static OSD_MAllocHook::Callback* MypCurrentCallback = NULL; +namespace { + // dummy function to call at place where break point might be needed + inline void place_for_breakpoint () {} +}; + //======================================================================= //function : GetCallback //purpose : @@ -414,11 +419,9 @@ void OSD_MAllocHook::LogFileHandler::AllocEvent myMutex.Lock(); myLogFile << "alloc "<< std::setw(10) << theRequestNum << std::setw(20) << theSize << std::endl; - myMutex.Unlock(); if (myBreakSize == theSize) - { - int a = 1; - } + place_for_breakpoint(); + myMutex.Unlock(); } } @@ -562,9 +565,7 @@ void OSD_MAllocHook::CollectBySize::AllocEvent long /*theRequestNum*/) { if (myBreakSize == theSize) - { - int a = 1; - } + place_for_breakpoint(); if (theSize > 0) { myMutex.Lock(); diff --git a/src/OSD/OSD_Path.cxx b/src/OSD/OSD_Path.cxx index bc4156fccb..c1be338ab9 100755 --- a/src/OSD/OSD_Path.cxx +++ b/src/OSD/OSD_Path.cxx @@ -1209,7 +1209,7 @@ void OSD_Path :: SystemName ( } // end OSD_Path :: SystemName Standard_Boolean OSD_Path :: IsValid ( - const TCollection_AsciiString& aDependentName, + const TCollection_AsciiString& /*aDependentName*/, const OSD_SysType aSysType ) const { @@ -1263,7 +1263,7 @@ Standard_Integer OSD_Path :: TrekLength () const { return retVal; - while ( Standard_True ) { + for (;;) { if ( myTrek.Token ( TEXT( "|" ), i++ ).IsEmpty () ) diff --git a/src/OSD/OSD_Process.cxx b/src/OSD/OSD_Process.cxx index 8ce6b526ca..9344a2e546 100755 --- a/src/OSD/OSD_Process.cxx +++ b/src/OSD/OSD_Process.cxx @@ -340,7 +340,7 @@ Standard_Boolean OSD_Process :: IsSuperUser () { Standard_Boolean retVal = FALSE; PSID pSIDadmin; HANDLE hProcessToken = INVALID_HANDLE_VALUE; - PTOKEN_GROUPS pTKgroups; + PTOKEN_GROUPS pTKgroups = NULL; if ( !OpenProcessToken ( GetCurrentProcess (), diff --git a/src/OSD/OSD_SharedLibrary.cxx b/src/OSD/OSD_SharedLibrary.cxx index 333f9c1bfa..174fdaa1b8 100755 --- a/src/OSD/OSD_SharedLibrary.cxx +++ b/src/OSD/OSD_SharedLibrary.cxx @@ -298,7 +298,7 @@ Standard_CString OSD_SharedLibrary :: Name () const { } // end OSD_SharedLibrary :: Name -Standard_Boolean OSD_SharedLibrary :: DlOpen ( const OSD_LoadMode Mode ) { +Standard_Boolean OSD_SharedLibrary :: DlOpen ( const OSD_LoadMode /*Mode*/ ) { Standard_Boolean retVal = Standard_True; diff --git a/src/OSD/OSD_WNT.cxx b/src/OSD/OSD_WNT.cxx index fdaa472b3b..6bd3522f17 100755 --- a/src/OSD/OSD_WNT.cxx +++ b/src/OSD/OSD_WNT.cxx @@ -911,7 +911,7 @@ BOOL MoveDirectory ( LPCTSTR oldDir, LPCTSTR newDir ) { LPTSTR pathSrc, pathDst; HANDLE hFindFile; BOOL fFind; - BOOL retVal; + BOOL retVal = FALSE; DIR_RESPONSE response; DWORD level; @@ -1043,16 +1043,14 @@ retry: if ( pFD -> dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) { - if ( !( retVal = MoveDirectory ( pFullNameSrc, pFullNameDst ) ) ) break; + retVal = MoveDirectory ( pFullNameSrc, pFullNameDst ); + if (!retVal) break; } else { retry_1: - if ( !( retVal = MoveFileEx ( - pFullNameSrc, pFullNameDst, - MOVEFILE_REPLACE_EXISTING | MOVEFILE_COPY_ALLOWED - ) - ) - ) { + retVal = MoveFileEx (pFullNameSrc, pFullNameDst, + MOVEFILE_REPLACE_EXISTING | MOVEFILE_COPY_ALLOWED); + if (! retVal) { if ( _response_dir_proc != NULL ) { @@ -1142,7 +1140,7 @@ retry_2: /***/ BOOL CopyDirectory ( LPCTSTR dirSrc, LPCTSTR dirDst ) { - PWIN32_FIND_DATA pFD; + PWIN32_FIND_DATA pFD = NULL; LPTSTR pName = NULL; LPTSTR pFullNameSrc = NULL; LPTSTR pFullNameDst = NULL; @@ -1203,11 +1201,13 @@ BOOL CopyDirectory ( LPCTSTR dirSrc, LPCTSTR dirDst ) { if ( pFD -> dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) { - if ( !( retVal = CopyDirectory ( pFullNameSrc, pFullNameDst ) ) ) break; + retVal = CopyDirectory ( pFullNameSrc, pFullNameDst ); + if ( ! retVal ) break; } else { retry: - if ( !( retVal = CopyFile ( pFullNameSrc, pFullNameDst, FALSE ) ) ) { + retVal = CopyFile ( pFullNameSrc, pFullNameDst, FALSE ); + if ( ! retVal ) { if ( _response_dir_proc != NULL ) { diff --git a/src/OSD/OSD_signal_WNT.cxx b/src/OSD/OSD_signal_WNT.cxx index 0cd15cb462..8f526d25f2 100755 --- a/src/OSD/OSD_signal_WNT.cxx +++ b/src/OSD/OSD_signal_WNT.cxx @@ -403,7 +403,8 @@ void OSD::SetSignal (const Standard_Boolean theFloatingSignal) SetConsoleCtrlHandler (&_osd_ctrl_break_handler, TRUE); #ifdef _MSC_VER - _se_translator_function pOldSeFunc = _set_se_translator (TranslateSE); +// _se_translator_function pOldSeFunc = + _set_se_translator (TranslateSE); #endif fFltExceptions = theFloatingSignal; @@ -533,7 +534,7 @@ LONG _osd_debug ( void ) { if ( !fDbgLoaded ) { - HKEY hKey; + HKEY hKey = NULL; HANDLE hEvent = INVALID_HANDLE_VALUE; DWORD dwKeyType; DWORD dwValueLen; @@ -620,12 +621,12 @@ LONG _osd_debug ( void ) { //void OSD::Handler(const OSD_Signals aSig, // const OSD_Signals aCode){} -void OSD::Handler(const OSD_Signals theSignal, - const Standard_Address theSigInfo, - const Standard_Address theContext) {} +void OSD::Handler(const OSD_Signals /*theSignal*/, + const Standard_Address /*theSigInfo*/, + const Standard_Address /*theContext*/) {} -void OSD::SegvHandler(const OSD_Signals aSig, - const Standard_Address code, - const Standard_Address scp){} +void OSD::SegvHandler(const OSD_Signals /*aSig*/, + const Standard_Address /*code*/, + const Standard_Address /*scp*/){} #endif // WNT diff --git a/src/OpenGl/OpenGl_LayerList.cxx b/src/OpenGl/OpenGl_LayerList.cxx index 333d59b4c3..cc25f07493 100644 --- a/src/OpenGl/OpenGl_LayerList.cxx +++ b/src/OpenGl/OpenGl_LayerList.cxx @@ -222,7 +222,6 @@ void OpenGl_LayerList::ChangeLayer (const OpenGl_Structure *theStructure, OpenGl_SequenceOfLayers::Iterator anIts; for (anIts.Init (myLayers); anIts.More (); anIts.Next (), aSeqId++) { - OpenGl_PriorityList& aScanList = anIts.ChangeValue (); if (aSeqPos == aSeqId) continue; diff --git a/src/OpenGl/OpenGl_Trihedron.cxx b/src/OpenGl/OpenGl_Trihedron.cxx index e367c7d599..6bc7d53262 100644 --- a/src/OpenGl/OpenGl_Trihedron.cxx +++ b/src/OpenGl/OpenGl_Trihedron.cxx @@ -158,7 +158,6 @@ void OpenGl_Trihedron::redraw (const Handle(OpenGl_Workspace)& theWorkspace) con /* * Creation du triedre */ - const OpenGl_AspectLine *AspectLine = theWorkspace->AspectLine( Standard_True ); /* Fotis Sioutis 2007-11-14 15:06 I have also seen in previous posts that the view trihedron in V3d_WIREFRAME mode diff --git a/src/OpenGl/OpenGl_View_2.cxx b/src/OpenGl/OpenGl_View_2.cxx index 4ad9445ce7..3ce2a6c436 100644 --- a/src/OpenGl/OpenGl_View_2.cxx +++ b/src/OpenGl/OpenGl_View_2.cxx @@ -1179,8 +1179,6 @@ void OpenGl_View::RenderStructs (const Handle(OpenGl_Workspace) &AWorkspace) glPushAttrib ( GL_DEPTH_BUFFER_BIT ); - const OpenGl_AspectLine *aspect_line = AWorkspace->AspectLine( Standard_True ); - //TsmPushAttri(); /* save previous graphics context */ if ( (AWorkspace->NamedStatus & OPENGL_NS_2NDPASSNEED) == 0 ) diff --git a/src/Prs3d/Prs3d_RadiusAspect.cxx b/src/Prs3d/Prs3d_RadiusAspect.cxx index 0e9c524c4c..8234b0727e 100755 --- a/src/Prs3d/Prs3d_RadiusAspect.cxx +++ b/src/Prs3d/Prs3d_RadiusAspect.cxx @@ -18,7 +18,7 @@ #include -Prs3d_RadiusAspect::Prs3d_RadiusAspect(const Quantity_NameOfColor aColor, +Prs3d_RadiusAspect::Prs3d_RadiusAspect(const Quantity_NameOfColor /*aColor*/, const Aspect_TypeOfLine aType, const Standard_Real aWidth) { } diff --git a/src/QABugs/QABugs_1.cxx b/src/QABugs/QABugs_1.cxx index 7489123529..ae91ac8f67 100644 --- a/src/QABugs/QABugs_1.cxx +++ b/src/QABugs/QABugs_1.cxx @@ -447,8 +447,6 @@ static Standard_Integer OCC74bug_get (Draw_Interpretor& di, Standard_Integer arg di << "ERROR : Usage : " << argv[0] << " shape; get selection mode" << "\n"; return 1; } - - Standard_Boolean updateviewer = Standard_True, PutInCollector = Standard_True; ViewerTest_DoubleMapOfInteractiveAndName& aMap = GetMapOfAIS(); diff --git a/src/QABugs/QABugs_11.cxx b/src/QABugs/QABugs_11.cxx index 11a67630db..6ea73da4b2 100755 --- a/src/QABugs/QABugs_11.cxx +++ b/src/QABugs/QABugs_11.cxx @@ -2694,8 +2694,7 @@ static Standard_Integer OCC7141 (Draw_Interpretor& di, Standard_Integer argc, co try { OCC_CATCH_SIGNALS if( writer.Transfer(document, mode)) { - IFSelect_ReturnStatus stat = - writer.Write(aFilePath.ToCString()); + writer.Write(aFilePath.ToCString()); } } catch(OSD_Exception_STACK_OVERFLOW) { diff --git a/src/QABugs/QABugs_13.cxx b/src/QABugs/QABugs_13.cxx index 29ed685cfa..209111b68e 100755 --- a/src/QABugs/QABugs_13.cxx +++ b/src/QABugs/QABugs_13.cxx @@ -62,7 +62,6 @@ static Standard_Integer OCC332bug (Draw_Interpretor& di, Standard_Integer argc, { // Used to Display Geometry or Topolgy char name[255]; - char *pname = name; Standard_Boolean check = Standard_True; // Set default arguments @@ -426,8 +425,6 @@ static Standard_Integer OCC544 (Draw_Interpretor& di, Standard_Integer argc, con // Used to Display Geometry or Topolgy char name[255]; - char *pname = name; - //bool check = true; Standard_Boolean check = Standard_True; // Set default arguments diff --git a/src/QABugs/QABugs_2.cxx b/src/QABugs/QABugs_2.cxx index 001715e0e0..378c1b9ac2 100755 --- a/src/QABugs/QABugs_2.cxx +++ b/src/QABugs/QABugs_2.cxx @@ -135,7 +135,6 @@ static Standard_Integer OCC527(Draw_Interpretor& di, Standard_Integer argc, cons if (!aResult.IsNull()) { double lmaxdist = 0.0; - double lmaxtoler = 0.0; TopExp_Explorer aExp2; for (aExp2.Init(aResult,TopAbs_VERTEX); aExp2.More(); aExp2.Next()) { diff --git a/src/QABugs/QABugs_3.cxx b/src/QABugs/QABugs_3.cxx index 26db4c9bcd..72792d45ff 100644 --- a/src/QABugs/QABugs_3.cxx +++ b/src/QABugs/QABugs_3.cxx @@ -1348,7 +1348,7 @@ static Standard_Integer BUC60856(Draw_Interpretor& di, Standard_Integer /*argc*/ } gp_Ax2 Cone_Ax; - double R1=8, R2=16, H1=20, H2=40, angle; + double R1=8, R2=16, angle; gp_Pnt P0(0,0,0), P1(0,0,20), P2(0,0,45); angle = 2*M_PI; @@ -1583,7 +1583,7 @@ static Standard_Integer statface (Draw_Interpretor& di,Standard_Integer /*argc*/ Handle(Dico_DictionaryOfInteger) aDico = new Dico_DictionaryOfInteger(); Handle(TColStd_HSequenceOfAsciiString) aSequence = new TColStd_HSequenceOfAsciiString; Standard_CString aString; - Standard_Integer i=1,j=1,k=1,l=1,aa=1; + Standard_Integer i=1,j=1,l=1,aa=1; TopExp_Explorer expl; Standard_Real f3d,l3d; for(expl.Init(aShape,TopAbs_FACE);expl.More();expl.Next()) diff --git a/src/QABugs/QABugs_9.cxx b/src/QABugs/QABugs_9.cxx index 5dfe86fdf2..ce662f00db 100755 --- a/src/QABugs/QABugs_9.cxx +++ b/src/QABugs/QABugs_9.cxx @@ -37,7 +37,7 @@ static Standard_Integer BUC60857 (Draw_Interpretor& di, Standard_Integer /*argc*/,const char ** argv) { gp_Ax2 Cone_Ax; - double R1=8, R2=16, H1=20, H2=40, angle; + double R1=8, R2=16, angle; gp_Pnt P0(0,0,0), P1(0,0,20), P2(0,0,45); angle = 2*M_PI; diff --git a/src/QANewBRepNaming/QANewBRepNaming_Gluing.cxx b/src/QANewBRepNaming/QANewBRepNaming_Gluing.cxx index 1033276a1c..817339bd54 100755 --- a/src/QANewBRepNaming/QANewBRepNaming_Gluing.cxx +++ b/src/QANewBRepNaming/QANewBRepNaming_Gluing.cxx @@ -89,8 +89,6 @@ void QANewBRepNaming_Gluing::Init(const TDF_Label& ResultLabel) { void QANewBRepNaming_Gluing::Load(QANewModTopOpe_Glue& theMkGluing) { TopoDS_Shape aResShape = theMkGluing.Shape(); const TopoDS_Shape& anObjShape = theMkGluing.Shape1(); - const TopoDS_Shape& aToolShape = theMkGluing.Shape2(); - const TopAbs_ShapeEnum& anObjectType = ShapeType(anObjShape); if (aResShape.IsNull()) { #ifdef MDTV_DEB diff --git a/src/QANewBRepNaming/QANewBRepNaming_Limitation.cxx b/src/QANewBRepNaming/QANewBRepNaming_Limitation.cxx index a16a0fcbea..ba89996910 100755 --- a/src/QANewBRepNaming/QANewBRepNaming_Limitation.cxx +++ b/src/QANewBRepNaming/QANewBRepNaming_Limitation.cxx @@ -59,7 +59,6 @@ void QANewBRepNaming_Limitation::Load(QANewModTopOpe_Limitation& MS) const { TopoDS_Shape ResSh = MS.Shape(); const TopoDS_Shape& ObjSh = MS.Shape1(); - const TopoDS_Shape& ToolSh = MS.Shape2(); const TopAbs_ShapeEnum& ObjType = ShapeType(ObjSh); if (ResSh.IsNull()) { diff --git a/src/QANewDBRepNaming/QANewDBRepNaming.cxx b/src/QANewDBRepNaming/QANewDBRepNaming.cxx index a2c33fa3b0..ffc6eb7651 100755 --- a/src/QANewDBRepNaming/QANewDBRepNaming.cxx +++ b/src/QANewDBRepNaming/QANewDBRepNaming.cxx @@ -148,10 +148,8 @@ static Standard_Integer QANewDBRepNaming_CheckNaming(Draw_Interpretor& di,Standa TopTools_IndexedMapOfShape allSubShapes; TopExp::MapShapes(aSelectedShape, allSubShapes); -// cout<<"SELECTION ..."<Get().ShapeType(); // cout<Get()); TNaming_Selector SLSolving(itr.Value()); diff --git a/src/QANewModTopOpe/QANewModTopOpe.cxx b/src/QANewModTopOpe/QANewModTopOpe.cxx index 60ebf4c52d..9d9bcd4ff1 100755 --- a/src/QANewModTopOpe/QANewModTopOpe.cxx +++ b/src/QANewModTopOpe/QANewModTopOpe.cxx @@ -578,7 +578,6 @@ Standard_Boolean QANewModTopOpe::IsConnected(const TopoDS_Shape& TheS) if(nbs <= 1) return aRes; math_Matrix aMat(1, nbs, 1, nbs, 0); - Standard_Integer aMax=nbs*nbs; TopTools_MapIteratorOfMapOfShape anMIter(aSMap); Standard_Integer n = 1; @@ -616,7 +615,7 @@ Standard_Boolean QANewModTopOpe::IsConnected(const TopoDS_Shape& TheS) } //cout << "QANewModTopOpe::IsConnected(3)Lnbs=" <ReadEntity(num, 1,"assigned_approval", ach, STANDARD_TYPE(StepBasic_Approval), aAssignedApproval); + data->ReadEntity(num, 1,"assigned_approval", ach, STANDARD_TYPE(StepBasic_Approval), aAssignedApproval); // --- own field : items --- diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedDateAndTimeAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAppliedDateAndTimeAssignment.cxx index 7b0410a3fc..8687827d59 100755 --- a/src/RWStepAP214/RWStepAP214_RWAppliedDateAndTimeAssignment.cxx +++ b/src/RWStepAP214/RWStepAP214_RWAppliedDateAndTimeAssignment.cxx @@ -46,18 +46,12 @@ void RWStepAP214_RWAppliedDateAndTimeAssignment::ReadStep // --- inherited field : assignedDateAndTime --- Handle(StepBasic_DateAndTime) aAssignedDateAndTime; -#ifdef DEB - Standard_Boolean stat1 = -#endif - data->ReadEntity(num, 1,"assigned_date_and_time", ach, STANDARD_TYPE(StepBasic_DateAndTime), aAssignedDateAndTime); + data->ReadEntity(num, 1,"assigned_date_and_time", ach, STANDARD_TYPE(StepBasic_DateAndTime), aAssignedDateAndTime); // --- inherited field : role --- Handle(StepBasic_DateTimeRole) aRole; -#ifdef DEB - Standard_Boolean stat2 = -#endif - data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_DateTimeRole), aRole); + data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_DateTimeRole), aRole); // --- own field : items --- diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedDateAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAppliedDateAssignment.cxx index 8ce18dc181..d1f832201b 100755 --- a/src/RWStepAP214/RWStepAP214_RWAppliedDateAssignment.cxx +++ b/src/RWStepAP214/RWStepAP214_RWAppliedDateAssignment.cxx @@ -46,18 +46,12 @@ void RWStepAP214_RWAppliedDateAssignment::ReadStep // --- inherited field : assignedDate --- Handle(StepBasic_Date) aAssignedDate; -#ifdef DEB - Standard_Boolean stat1 = -#endif - data->ReadEntity(num, 1,"assigned_date", ach, STANDARD_TYPE(StepBasic_Date), aAssignedDate); + data->ReadEntity(num, 1,"assigned_date", ach, STANDARD_TYPE(StepBasic_Date), aAssignedDate); // --- inherited field : role --- Handle(StepBasic_DateRole) aRole; -#ifdef DEB - Standard_Boolean stat2 = -#endif - data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_DateRole), aRole); + data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_DateRole), aRole); // --- own field : items --- diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedDocumentReference.cxx b/src/RWStepAP214/RWStepAP214_RWAppliedDocumentReference.cxx index ac7d332e0b..6f385c5b8b 100755 --- a/src/RWStepAP214/RWStepAP214_RWAppliedDocumentReference.cxx +++ b/src/RWStepAP214/RWStepAP214_RWAppliedDocumentReference.cxx @@ -38,10 +38,7 @@ void RWStepAP214_RWAppliedDocumentReference::ReadStep // --- inherited field : assigned_document Handle(StepBasic_Document) adoc; -#ifdef DEB - Standard_Boolean stat1 = -#endif - data->ReadEntity + data->ReadEntity (num, 1,"assigned_document", ach, STANDARD_TYPE(StepBasic_Document), adoc); // --- inherited field : source --- diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedOrganizationAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAppliedOrganizationAssignment.cxx index 2991386a10..08824ece7e 100755 --- a/src/RWStepAP214/RWStepAP214_RWAppliedOrganizationAssignment.cxx +++ b/src/RWStepAP214/RWStepAP214_RWAppliedOrganizationAssignment.cxx @@ -46,18 +46,12 @@ void RWStepAP214_RWAppliedOrganizationAssignment::ReadStep // --- inherited field : assignedOrganization --- Handle(StepBasic_Organization) aAssignedOrganization; -#ifdef DEB - Standard_Boolean stat1 = -#endif - data->ReadEntity(num, 1,"assigned_organization", ach, STANDARD_TYPE(StepBasic_Organization), aAssignedOrganization); + data->ReadEntity(num, 1,"assigned_organization", ach, STANDARD_TYPE(StepBasic_Organization), aAssignedOrganization); // --- inherited field : role --- Handle(StepBasic_OrganizationRole) aRole; -#ifdef DEB - Standard_Boolean stat2 = -#endif - data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_OrganizationRole), aRole); + data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_OrganizationRole), aRole); // --- own field : items --- diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedPersonAndOrganizationAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAppliedPersonAndOrganizationAssignment.cxx index 4764e8e6f8..32deeecb4c 100755 --- a/src/RWStepAP214/RWStepAP214_RWAppliedPersonAndOrganizationAssignment.cxx +++ b/src/RWStepAP214/RWStepAP214_RWAppliedPersonAndOrganizationAssignment.cxx @@ -46,18 +46,12 @@ void RWStepAP214_RWAppliedPersonAndOrganizationAssignment::ReadStep // --- inherited field : assignedPersonAndOrganization --- Handle(StepBasic_PersonAndOrganization) aAssignedPersonAndOrganization; -#ifdef DEB - Standard_Boolean stat1 = -#endif - data->ReadEntity(num, 1,"assigned_person_and_organization", ach, STANDARD_TYPE(StepBasic_PersonAndOrganization), aAssignedPersonAndOrganization); + data->ReadEntity(num, 1,"assigned_person_and_organization", ach, STANDARD_TYPE(StepBasic_PersonAndOrganization), aAssignedPersonAndOrganization); // --- inherited field : role --- Handle(StepBasic_PersonAndOrganizationRole) aRole; -#ifdef DEB - Standard_Boolean stat2 = -#endif - data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_PersonAndOrganizationRole), aRole); + data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_PersonAndOrganizationRole), aRole); // --- own field : items --- diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedSecurityClassificationAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAppliedSecurityClassificationAssignment.cxx index e7aa80c8ca..1569f8d3d8 100755 --- a/src/RWStepAP214/RWStepAP214_RWAppliedSecurityClassificationAssignment.cxx +++ b/src/RWStepAP214/RWStepAP214_RWAppliedSecurityClassificationAssignment.cxx @@ -45,10 +45,7 @@ void RWStepAP214_RWAppliedSecurityClassificationAssignment::ReadStep // --- inherited field : assignedSecurityClassification --- Handle(StepBasic_SecurityClassification) aAssignedSecurityClassification; -#ifdef DEB - Standard_Boolean stat1 = -#endif - data->ReadEntity(num, 1,"assigned_security_classification", ach, STANDARD_TYPE(StepBasic_SecurityClassification), aAssignedSecurityClassification); + data->ReadEntity(num, 1,"assigned_security_classification", ach, STANDARD_TYPE(StepBasic_SecurityClassification), aAssignedSecurityClassification); // --- own field : items --- diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.cxx index ae972409f2..d1ab638a52 100755 --- a/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.cxx +++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.cxx @@ -46,18 +46,12 @@ void RWStepAP214_RWAutoDesignActualDateAndTimeAssignment::ReadStep // --- inherited field : assignedDateAndTime --- Handle(StepBasic_DateAndTime) aAssignedDateAndTime; -#ifdef DEB - Standard_Boolean stat1 = -#endif - data->ReadEntity(num, 1,"assigned_date_and_time", ach, STANDARD_TYPE(StepBasic_DateAndTime), aAssignedDateAndTime); + data->ReadEntity(num, 1,"assigned_date_and_time", ach, STANDARD_TYPE(StepBasic_DateAndTime), aAssignedDateAndTime); // --- inherited field : role --- Handle(StepBasic_DateTimeRole) aRole; -#ifdef DEB - Standard_Boolean stat2 = -#endif - data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_DateTimeRole), aRole); + data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_DateTimeRole), aRole); // --- own field : items --- diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAssignment.cxx index 3aa2513b4e..01b062eaec 100755 --- a/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAssignment.cxx +++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAssignment.cxx @@ -46,18 +46,12 @@ void RWStepAP214_RWAutoDesignActualDateAssignment::ReadStep // --- inherited field : assignedDate --- Handle(StepBasic_Date) aAssignedDate; -#ifdef DEB - Standard_Boolean stat1 = -#endif - data->ReadEntity(num, 1,"assigned_date", ach, STANDARD_TYPE(StepBasic_Date), aAssignedDate); + data->ReadEntity(num, 1,"assigned_date", ach, STANDARD_TYPE(StepBasic_Date), aAssignedDate); // --- inherited field : role --- Handle(StepBasic_DateRole) aRole; -#ifdef DEB - Standard_Boolean stat2 = -#endif - data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_DateRole), aRole); + data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_DateRole), aRole); // --- own field : items --- diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignApprovalAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignApprovalAssignment.cxx index f1b31dbace..80dc92d1a9 100755 --- a/src/RWStepAP214/RWStepAP214_RWAutoDesignApprovalAssignment.cxx +++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignApprovalAssignment.cxx @@ -45,10 +45,7 @@ void RWStepAP214_RWAutoDesignApprovalAssignment::ReadStep // --- inherited field : assignedApproval --- Handle(StepBasic_Approval) aAssignedApproval; -#ifdef DEB - Standard_Boolean stat1 = -#endif - data->ReadEntity(num, 1,"assigned_approval", ach, STANDARD_TYPE(StepBasic_Approval), aAssignedApproval); + data->ReadEntity(num, 1,"assigned_approval", ach, STANDARD_TYPE(StepBasic_Approval), aAssignedApproval); // --- own field : items --- diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignDateAndPersonAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignDateAndPersonAssignment.cxx index c88301b9af..fadad73310 100755 --- a/src/RWStepAP214/RWStepAP214_RWAutoDesignDateAndPersonAssignment.cxx +++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignDateAndPersonAssignment.cxx @@ -46,18 +46,12 @@ void RWStepAP214_RWAutoDesignDateAndPersonAssignment::ReadStep // --- inherited field : assignedPersonAndOrganization --- Handle(StepBasic_PersonAndOrganization) aAssignedPersonAndOrganization; -#ifdef DEB - Standard_Boolean stat1 = -#endif - data->ReadEntity(num, 1,"assigned_person_and_organization", ach, STANDARD_TYPE(StepBasic_PersonAndOrganization), aAssignedPersonAndOrganization); + data->ReadEntity(num, 1,"assigned_person_and_organization", ach, STANDARD_TYPE(StepBasic_PersonAndOrganization), aAssignedPersonAndOrganization); // --- inherited field : role --- Handle(StepBasic_PersonAndOrganizationRole) aRole; -#ifdef DEB - Standard_Boolean stat2 = -#endif - data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_PersonAndOrganizationRole), aRole); + data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_PersonAndOrganizationRole), aRole); // --- own field : items --- diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignDocumentReference.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignDocumentReference.cxx index 8448dee3e4..8b0c7519eb 100755 --- a/src/RWStepAP214/RWStepAP214_RWAutoDesignDocumentReference.cxx +++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignDocumentReference.cxx @@ -38,10 +38,7 @@ void RWStepAP214_RWAutoDesignDocumentReference::ReadStep // --- inherited field : assigned_document Handle(StepBasic_Document) adoc; -#ifdef DEB - Standard_Boolean stat1 = -#endif - data->ReadEntity + data->ReadEntity (num, 1,"assigned_document", ach, STANDARD_TYPE(StepBasic_Document), adoc); // --- inherited field : source --- diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.cxx index 84a0a0a424..cefde0eafc 100755 --- a/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.cxx +++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.cxx @@ -46,18 +46,12 @@ void RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment::ReadStep // --- inherited field : assignedDateAndTime --- Handle(StepBasic_DateAndTime) aAssignedDateAndTime; -#ifdef DEB - Standard_Boolean stat1 = -#endif - data->ReadEntity(num, 1,"assigned_date_and_time", ach, STANDARD_TYPE(StepBasic_DateAndTime), aAssignedDateAndTime); + data->ReadEntity(num, 1,"assigned_date_and_time", ach, STANDARD_TYPE(StepBasic_DateAndTime), aAssignedDateAndTime); // --- inherited field : role --- Handle(StepBasic_DateTimeRole) aRole; -#ifdef DEB - Standard_Boolean stat2 = -#endif - data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_DateTimeRole), aRole); + data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_DateTimeRole), aRole); // --- own field : items --- diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAssignment.cxx index 6a7c1b5981..12bba23574 100755 --- a/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAssignment.cxx +++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAssignment.cxx @@ -46,18 +46,12 @@ void RWStepAP214_RWAutoDesignNominalDateAssignment::ReadStep // --- inherited field : assignedDate --- Handle(StepBasic_Date) aAssignedDate; -#ifdef DEB - Standard_Boolean stat1 = -#endif - data->ReadEntity(num, 1,"assigned_date", ach, STANDARD_TYPE(StepBasic_Date), aAssignedDate); + data->ReadEntity(num, 1,"assigned_date", ach, STANDARD_TYPE(StepBasic_Date), aAssignedDate); // --- inherited field : role --- Handle(StepBasic_DateRole) aRole; -#ifdef DEB - Standard_Boolean stat2 = -#endif - data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_DateRole), aRole); + data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_DateRole), aRole); // --- own field : items --- diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignOrganizationAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignOrganizationAssignment.cxx index aacd91a072..48e372933f 100755 --- a/src/RWStepAP214/RWStepAP214_RWAutoDesignOrganizationAssignment.cxx +++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignOrganizationAssignment.cxx @@ -46,18 +46,12 @@ void RWStepAP214_RWAutoDesignOrganizationAssignment::ReadStep // --- inherited field : assignedOrganization --- Handle(StepBasic_Organization) aAssignedOrganization; -#ifdef DEB - Standard_Boolean stat1 = -#endif - data->ReadEntity(num, 1,"assigned_organization", ach, STANDARD_TYPE(StepBasic_Organization), aAssignedOrganization); + data->ReadEntity(num, 1,"assigned_organization", ach, STANDARD_TYPE(StepBasic_Organization), aAssignedOrganization); // --- inherited field : role --- Handle(StepBasic_OrganizationRole) aRole; -#ifdef DEB - Standard_Boolean stat2 = -#endif - data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_OrganizationRole), aRole); + data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_OrganizationRole), aRole); // --- own field : items --- diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.cxx index ec8e5d22c5..9e32a4afb3 100755 --- a/src/RWStepAP214/RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.cxx +++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.cxx @@ -46,18 +46,12 @@ void RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment::ReadStep // --- inherited field : assignedPersonAndOrganization --- Handle(StepBasic_PersonAndOrganization) aAssignedPersonAndOrganization; -#ifdef DEB - Standard_Boolean stat1 = -#endif - data->ReadEntity(num, 1,"assigned_person_and_organization", ach, STANDARD_TYPE(StepBasic_PersonAndOrganization), aAssignedPersonAndOrganization); + data->ReadEntity(num, 1,"assigned_person_and_organization", ach, STANDARD_TYPE(StepBasic_PersonAndOrganization), aAssignedPersonAndOrganization); // --- inherited field : role --- Handle(StepBasic_PersonAndOrganizationRole) aRole; -#ifdef DEB - Standard_Boolean stat2 = -#endif - data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_PersonAndOrganizationRole), aRole); + data->ReadEntity(num, 2,"role", ach, STANDARD_TYPE(StepBasic_PersonAndOrganizationRole), aRole); // --- own field : items --- diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignSecurityClassificationAssignment.cxx b/src/RWStepAP214/RWStepAP214_RWAutoDesignSecurityClassificationAssignment.cxx index 9172bea3b5..8c704d13e2 100755 --- a/src/RWStepAP214/RWStepAP214_RWAutoDesignSecurityClassificationAssignment.cxx +++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignSecurityClassificationAssignment.cxx @@ -45,10 +45,7 @@ void RWStepAP214_RWAutoDesignSecurityClassificationAssignment::ReadStep // --- inherited field : assignedSecurityClassification --- Handle(StepBasic_SecurityClassification) aAssignedSecurityClassification; -#ifdef DEB - Standard_Boolean stat1 = -#endif - data->ReadEntity(num, 1,"assigned_security_classification", ach, STANDARD_TYPE(StepBasic_SecurityClassification), aAssignedSecurityClassification); + data->ReadEntity(num, 1,"assigned_security_classification", ach, STANDARD_TYPE(StepBasic_SecurityClassification), aAssignedSecurityClassification); // --- own field : items --- diff --git a/src/RWStepBasic/RWStepBasic_RWApplicationContextElement.cxx b/src/RWStepBasic/RWStepBasic_RWApplicationContextElement.cxx index 72f766ac32..bd184d4552 100755 --- a/src/RWStepBasic/RWStepBasic_RWApplicationContextElement.cxx +++ b/src/RWStepBasic/RWStepBasic_RWApplicationContextElement.cxx @@ -49,10 +49,7 @@ void RWStepBasic_RWApplicationContextElement::ReadStep // --- own field : frameOfReference --- Handle(StepBasic_ApplicationContext) aFrameOfReference; -#ifdef DEB - Standard_Boolean stat2 = -#endif - data->ReadEntity(num, 2,"frame_of_reference", ach, STANDARD_TYPE(StepBasic_ApplicationContext), aFrameOfReference); + data->ReadEntity(num, 2,"frame_of_reference", ach, STANDARD_TYPE(StepBasic_ApplicationContext), aFrameOfReference); //--- Initialisation of the read entity --- diff --git a/src/Resource/Resource_Manager.cxx b/src/Resource/Resource_Manager.cxx index 5b1695316d..34312052df 100755 --- a/src/Resource/Resource_Manager.cxx +++ b/src/Resource/Resource_Manager.cxx @@ -189,7 +189,8 @@ static Standard_Integer WhatKindOfLine(OSD_File& aFile, if (Debug) cout << "Key = '" << aToken1 << flush ; - if ((Pos = Line.FirstLocationNotInSet(WhiteSpace, Pos2+1, Line.Length()))) { + Pos = Line.FirstLocationNotInSet(WhiteSpace, Pos2+1, Line.Length()); + if (Pos) { if (Line.Value(Pos) == '\\') switch(Line.Value(Pos+1)) { case '\\' : diff --git a/src/STEPCAFControl/STEPCAFControl_Reader.cxx b/src/STEPCAFControl/STEPCAFControl_Reader.cxx index e1a4e05fdb..6eb1906ab4 100755 --- a/src/STEPCAFControl/STEPCAFControl_Reader.cxx +++ b/src/STEPCAFControl/STEPCAFControl_Reader.cxx @@ -2085,7 +2085,6 @@ void STEPCAFControl_Reader::ExpandSubShapes(const Handle(XCAFDoc_ShapeTool)& Sha const XCAFDoc_DataMapOfShapeLabel& ShapeLabelMap, const STEPCAFControl_DataMapOfShapePD& ShapePDMap) const { - const Handle(Interface_InterfaceModel)& Model = Reader().WS()->Model(); const Handle(Transfer_TransientProcess)& TP = Reader().WS()->TransferReader()->TransientProcess(); NCollection_DataMap ShapeNameMap; TColStd_MapOfTransient aRepItems; diff --git a/src/Select3D/Select3D_SensitiveEntity.cxx b/src/Select3D/Select3D_SensitiveEntity.cxx index 7ac60e546d..df6595f062 100755 --- a/src/Select3D/Select3D_SensitiveEntity.cxx +++ b/src/Select3D/Select3D_SensitiveEntity.cxx @@ -91,7 +91,7 @@ Standard_Boolean Select3D_SensitiveEntity::Matches(const Standard_Real XMin, //======================================================================= Standard_Boolean Select3D_SensitiveEntity::Matches(const TColgp_Array1OfPnt2d& aPoly, - const Bnd_Box2d& aBox, + const Bnd_Box2d& /*aBox*/, const Standard_Real aTol) { return Standard_False; diff --git a/src/ShapeAnalysis/ShapeAnalysis_FreeBounds.cxx b/src/ShapeAnalysis/ShapeAnalysis_FreeBounds.cxx index 80997c1fdf..4eb641713c 100755 --- a/src/ShapeAnalysis/ShapeAnalysis_FreeBounds.cxx +++ b/src/ShapeAnalysis/ShapeAnalysis_FreeBounds.cxx @@ -366,7 +366,7 @@ static void SplitWire(const TopoDS_Wire& wire, ces.Append (i); statuses.SetValue (i, 1); //putting into CES Standard_Boolean SearchBackward = Standard_True; - while (Standard_True) { + for(;;) { Standard_Integer ei = ces.Last(); //ei-edge index, number of current edge analyzed for connection Standard_Boolean found; TopoDS_Edge edge; diff --git a/src/ShapeFix/ShapeFix_ComposeShell.cxx b/src/ShapeFix/ShapeFix_ComposeShell.cxx index e2e2831c02..a0a41c9e60 100755 --- a/src/ShapeFix/ShapeFix_ComposeShell.cxx +++ b/src/ShapeFix/ShapeFix_ComposeShell.cxx @@ -2004,7 +2004,7 @@ void ShapeFix_ComposeShell::CollectWires (ShapeFix_SequenceOfWireSegment &wires, Standard_Integer iumin, iumax, ivmin, ivmax; Standard_Real dsu=0., dsv=0.; Standard_Boolean canBeClosed = Standard_False; - while ( 1 ) { + for(;;) { Standard_Integer index = 0; Standard_Boolean misoriented = Standard_True, samepatch = Standard_False; Standard_Boolean reverse = Standard_False, connected = Standard_False; @@ -2731,7 +2731,7 @@ void ShapeFix_ComposeShell::DispatchWires (TopTools_SequenceOfShape &faces, // Collect wires in packets lying on same surface and dispatch them TColStd_Array1OfBoolean used ( 1, nb ); used.Init ( Standard_False ); - while ( 1 ) { + for(;;) { TopTools_SequenceOfShape loops; Handle(Geom_Surface) Surf; diff --git a/src/Standard/Standard.cxx b/src/Standard/Standard.cxx index 441573347e..babb72c392 100755 --- a/src/Standard/Standard.cxx +++ b/src/Standard/Standard.cxx @@ -74,9 +74,10 @@ Standard_MMgrFactory::Standard_MMgrFactory() #endif*/ char* aVar; - Standard_Integer anAllocId = (aVar = getenv ("MMGT_OPT" )) ? atoi (aVar) : - (OCCT_MMGT_OPT_DEFAULT); - Standard_Boolean toClear = (aVar = getenv ("MMGT_CLEAR" )) ? (atoi (aVar) != 0) : Standard_True; + aVar = getenv ("MMGT_OPT"); + Standard_Integer anAllocId = (aVar ? atoi (aVar): OCCT_MMGT_OPT_DEFAULT); + aVar = getenv ("MMGT_CLEAR"); + Standard_Boolean toClear = (aVar ? (atoi (aVar) != 0) : Standard_True); // on Windows (actual for XP and 2000) activate low fragmentation heap // for CRT heap in order to get best performance. @@ -95,10 +96,14 @@ Standard_MMgrFactory::Standard_MMgrFactory() { case 1: // OCCT optimized memory allocator { - Standard_Boolean bMMap = (aVar = getenv ("MMGT_MMAP" )) ? (atoi (aVar) != 0) : Standard_True; - Standard_Integer aCellSize = (aVar = getenv ("MMGT_CELLSIZE" )) ? atoi (aVar) : 200; - Standard_Integer aNbPages = (aVar = getenv ("MMGT_NBPAGES" )) ? atoi (aVar) : 1000; - Standard_Integer aThreshold = (aVar = getenv ("MMGT_THRESHOLD")) ? atoi (aVar) : 40000; + aVar = getenv ("MMGT_MMAP"); + Standard_Boolean bMMap = (aVar ? (atoi (aVar) != 0) : Standard_True); + aVar = getenv ("MMGT_CELLSIZE"); + Standard_Integer aCellSize = (aVar ? atoi (aVar) : 200); + aVar = getenv ("MMGT_NBPAGES"); + Standard_Integer aNbPages = (aVar ? atoi (aVar) : 1000); + aVar = getenv ("MMGT_THRESHOLD"); + Standard_Integer aThreshold = (aVar ? atoi (aVar) : 40000); myFMMgr = new Standard_MMgrOpt (toClear, bMMap, aCellSize, aNbPages, aThreshold); break; } diff --git a/src/Standard/Standard_MMgrOpt.cxx b/src/Standard/Standard_MMgrOpt.cxx index 332c9bfc8a..bf34b1fa6a 100755 --- a/src/Standard/Standard_MMgrOpt.cxx +++ b/src/Standard/Standard_MMgrOpt.cxx @@ -796,7 +796,7 @@ retry: HANDLE * aMBlock = NULL; // check for error and try allocating address space if ( ! hMap || GetLastError() == ERROR_ALREADY_EXISTS || - ! (aMBlock = (HANDLE*)MapViewOfFile(hMap,FILE_MAP_WRITE,0,0,0)) ) + ! ((aMBlock = (HANDLE*)MapViewOfFile(hMap,FILE_MAP_WRITE,0,0,0))) ) { // close handle if allocated if ( hMap ) diff --git a/src/StdPrs/StdPrs_Curve.cxx b/src/StdPrs/StdPrs_Curve.cxx index 449b5ddc09..15d4bfdeda 100755 --- a/src/StdPrs/StdPrs_Curve.cxx +++ b/src/StdPrs/StdPrs_Curve.cxx @@ -251,7 +251,7 @@ void StdPrs_Curve::Add (const Handle (Prs3d_Presentation)& aPresentation, //================================================================== void StdPrs_Curve::Add (const Handle (Prs3d_Presentation)& aPresentation, const Adaptor3d_Curve& aCurve, - const Quantity_Length aDeflection, + const Quantity_Length /*aDeflection*/, const Handle(Prs3d_Drawer)& aDrawer, TColgp_SequenceOfPnt& Points, const Standard_Boolean drawCurve) @@ -272,7 +272,7 @@ void StdPrs_Curve::Add (const Handle (Prs3d_Presentation)& aPresentation, const Adaptor3d_Curve& aCurve, const Standard_Real U1, const Standard_Real U2, - const Quantity_Length aDeflection, + const Quantity_Length /*aDeflection*/, TColgp_SequenceOfPnt& Points, const Standard_Integer NbPoints, const Standard_Boolean drawCurve) diff --git a/src/StdPrs/StdPrs_WFRestrictedFace.cxx b/src/StdPrs/StdPrs_WFRestrictedFace.cxx index c653ab5348..7fb355fb9e 100644 --- a/src/StdPrs/StdPrs_WFRestrictedFace.cxx +++ b/src/StdPrs/StdPrs_WFRestrictedFace.cxx @@ -49,7 +49,6 @@ void StdPrs_WFRestrictedFace::Add const Handle(Prs3d_Drawer)& theDrawer, Prs3d_NListOfSequenceOfPnt& theCurves) { - Standard_Real aLimit = theDrawer->MaximalParameterValue(); Standard_Integer aNbPoints = theDrawer->Discretisation(); StdPrs_ToolRFace aToolRst (theFace); diff --git a/src/StepBasic/StepBasic_SiUnit.cxx b/src/StepBasic/StepBasic_SiUnit.cxx index 8276cc0723..b6d459f101 100755 --- a/src/StepBasic/StepBasic_SiUnit.cxx +++ b/src/StepBasic/StepBasic_SiUnit.cxx @@ -78,7 +78,7 @@ StepBasic_SiUnitName StepBasic_SiUnit::Name() const } -void StepBasic_SiUnit::SetDimensions(const Handle(StepBasic_DimensionalExponents)& aDimensions) +void StepBasic_SiUnit::SetDimensions(const Handle(StepBasic_DimensionalExponents)& /*aDimensions*/) { // WARNING : the field is redefined. // field set up forbidden. diff --git a/src/StepData/StepData_DefaultGeneral.cxx b/src/StepData/StepData_DefaultGeneral.cxx index 6f05b5ee9d..0031499d9f 100755 --- a/src/StepData/StepData_DefaultGeneral.cxx +++ b/src/StepData/StepData_DefaultGeneral.cxx @@ -55,7 +55,7 @@ StepData_DefaultGeneral::StepData_DefaultGeneral () void StepData_DefaultGeneral::CheckCase(const Standard_Integer casenum, const Handle(Standard_Transient)& ent, const Interface_ShareTool& shares, - Handle(Interface_Check)& ach) const + Handle(Interface_Check)& /*ach*/) const { } // pas de Check sur une UndefinedEntity diff --git a/src/StepData/StepData_DescrGeneral.cxx b/src/StepData/StepData_DescrGeneral.cxx index a1dee0af74..5c689e477f 100755 --- a/src/StepData/StepData_DescrGeneral.cxx +++ b/src/StepData/StepData_DescrGeneral.cxx @@ -37,7 +37,7 @@ StepData_DescrGeneral::StepData_DescrGeneral void StepData_DescrGeneral::CheckCase(const Standard_Integer CN, const Handle(Standard_Transient)& ent, const Interface_ShareTool& shares, - Handle(Interface_Check)& ach) const + Handle(Interface_Check)& /*ach*/) const { } // pour l instant diff --git a/src/StepData/StepData_PDescr.cxx b/src/StepData/StepData_PDescr.cxx index 3f25e3c578..b2fd152cf4 100755 --- a/src/StepData/StepData_PDescr.cxx +++ b/src/StepData/StepData_PDescr.cxx @@ -224,7 +224,7 @@ StepData_PDescr::StepData_PDescr () void StepData_PDescr::Check(const StepData_Field& afild, - Handle(Interface_Check)& ach) const + Handle(Interface_Check)& /*ach*/) const { // pour l instant ... } diff --git a/src/StepData/StepData_Simple.cxx b/src/StepData/StepData_Simple.cxx index 788a9f1e71..b2d28fa5c5 100755 --- a/src/StepData/StepData_Simple.cxx +++ b/src/StepData/StepData_Simple.cxx @@ -78,7 +78,7 @@ StepData_Simple::StepData_Simple (const Handle(StepData_ESDescr)& descr) { return thefields; } -void StepData_Simple::Check(Handle(Interface_Check)& ach) const +void StepData_Simple::Check(Handle(Interface_Check)& /*ach*/) const { } // qq chose ? cf la description diff --git a/src/StepData/StepData_StepReaderData.cxx b/src/StepData/StepData_StepReaderData.cxx index f644b788b1..dd3f808f87 100755 --- a/src/StepData/StepData_StepReaderData.cxx +++ b/src/StepData/StepData_StepReaderData.cxx @@ -1606,7 +1606,7 @@ void StepData_StepReaderData::SetEntityNumbers(const Standard_Boolean withmap) Standard_Integer fromscope = nr; Standard_Integer toscope = indm(indmap); if (toscope < 0) toscope = -toscope; - while (1) { + for(;;) { fromscope --; // iteration de base if (fromscope <= toscope) { errorscope = Standard_True; // BANG, on est dessus diff --git a/src/StepShape/StepShape_OrientedClosedShell.cxx b/src/StepShape/StepShape_OrientedClosedShell.cxx index e441c474a3..c7cd6c327d 100755 --- a/src/StepShape/StepShape_OrientedClosedShell.cxx +++ b/src/StepShape/StepShape_OrientedClosedShell.cxx @@ -63,7 +63,7 @@ Standard_Boolean StepShape_OrientedClosedShell::Orientation() const return orientation; } -void StepShape_OrientedClosedShell::SetCfsFaces(const Handle(StepShape_HArray1OfFace)& aCfsFaces) +void StepShape_OrientedClosedShell::SetCfsFaces(const Handle(StepShape_HArray1OfFace)& /*aCfsFaces*/) { // WARNING : the field is redefined. // field set up forbidden. diff --git a/src/StepShape/StepShape_OrientedFace.cxx b/src/StepShape/StepShape_OrientedFace.cxx index 414833a09e..cd49a4dd8a 100755 --- a/src/StepShape/StepShape_OrientedFace.cxx +++ b/src/StepShape/StepShape_OrientedFace.cxx @@ -63,7 +63,7 @@ Standard_Boolean StepShape_OrientedFace::Orientation() const return orientation; } -void StepShape_OrientedFace::SetBounds(const Handle(StepShape_HArray1OfFaceBound)& aBounds) +void StepShape_OrientedFace::SetBounds(const Handle(StepShape_HArray1OfFaceBound)& /*aBounds*/) { // WARNING : the field is redefined. // field set up forbidden. diff --git a/src/StepShape/StepShape_OrientedOpenShell.cxx b/src/StepShape/StepShape_OrientedOpenShell.cxx index 75117ee81c..7618189a1d 100755 --- a/src/StepShape/StepShape_OrientedOpenShell.cxx +++ b/src/StepShape/StepShape_OrientedOpenShell.cxx @@ -63,7 +63,7 @@ Standard_Boolean StepShape_OrientedOpenShell::Orientation() const return orientation; } -void StepShape_OrientedOpenShell::SetCfsFaces(const Handle(StepShape_HArray1OfFace)& aCfsFaces) +void StepShape_OrientedOpenShell::SetCfsFaces(const Handle(StepShape_HArray1OfFace)& /*aCfsFaces*/) { // WARNING : the field is redefined. // field set up forbidden. diff --git a/src/Storage/Storage_Schema.cxx b/src/Storage/Storage_Schema.cxx index 7436a45d64..16b9022a80 100755 --- a/src/Storage/Storage_Schema.cxx +++ b/src/Storage/Storage_Schema.cxx @@ -585,7 +585,7 @@ static Standard_Integer i; } if (result) { - Standard_Integer otype,oref; + Standard_Integer otype, oref = 0; errorCode = f.BeginReadRefSection(); @@ -1364,7 +1364,7 @@ Standard_Boolean Storage_Schema::CheckTypeMigration( if(aFile.IsOpen() && aFile.IsReadable()) { TCollection_AsciiString aLine; Standard_Integer aNbReaded(0); - while (1) { + for (;;) { aFile.ReadLine(aLine, 80, aNbReaded); if(aFile.IsAtEnd() || !aNbReaded) { aFile.Close(); diff --git a/src/TColStd/TColStd_MapIteratorOfPackedMapOfInteger.cxx b/src/TColStd/TColStd_MapIteratorOfPackedMapOfInteger.cxx index 159c0c5c4a..dc5ec63f8c 100755 --- a/src/TColStd/TColStd_MapIteratorOfPackedMapOfInteger.cxx +++ b/src/TColStd/TColStd_MapIteratorOfPackedMapOfInteger.cxx @@ -35,7 +35,7 @@ extern Standard_Integer TColStd_intMapNode_findNext (const TColStd_intMapNode *, TColStd_MapIteratorOfPackedMapOfInteger::TColStd_MapIteratorOfPackedMapOfInteger (const TColStd_PackedMapOfInteger& theMap) : TCollection_BasicMapIterator (theMap), - myIntMask (~0) + myIntMask (~0U) { if (myNode) { const TColStd_intMapNode * aNode = @@ -54,7 +54,7 @@ void TColStd_MapIteratorOfPackedMapOfInteger::Initialize (const TColStd_PackedMapOfInteger& theMap) { TCollection_BasicMapIterator::Initialize (theMap); - myIntMask = ~0; + myIntMask = ~0U; if (myNode) { const TColStd_intMapNode * aNode = reinterpret_cast (myNode); @@ -70,7 +70,7 @@ void TColStd_MapIteratorOfPackedMapOfInteger::Initialize void TColStd_MapIteratorOfPackedMapOfInteger::Reset () { TCollection_BasicMapIterator::Reset(); - myIntMask = ~0; + myIntMask = ~0U; if (myNode) { const TColStd_intMapNode * aNode = reinterpret_cast (myNode); diff --git a/src/TColStd/TColStd_PackedMapOfInteger.cxx b/src/TColStd/TColStd_PackedMapOfInteger.cxx index 544422d590..fae5fe932e 100755 --- a/src/TColStd/TColStd_PackedMapOfInteger.cxx +++ b/src/TColStd/TColStd_PackedMapOfInteger.cxx @@ -193,9 +193,9 @@ Standard_Integer TColStd_intMapNode_findNext (const TColStd_intMapNode* theNode, unsigned int val = theNode->myData & theMask; int nZeros (0); if (val == 0) - theMask = ~0; // void, nothing to do + theMask = ~0U; // void, nothing to do else{ - unsigned int aMask = ~0; + unsigned int aMask = ~0U; if ((val & 0x0000ffff) == 0) { aMask = 0xffff0000; nZeros = 16; @@ -237,9 +237,9 @@ Standard_Integer TColStd_intMapNode_findPrev (const TColStd_intMapNode* theNode, unsigned int val = theNode->myData & theMask; int nZeros (0); if (val == 0) - theMask = ~0; // void, nothing to do + theMask = ~0U; // void, nothing to do else { - unsigned int aMask = ~0; + unsigned int aMask = ~0U; if ((val & 0xffff0000) == 0) { aMask = 0x0000ffff; nZeros = 16; @@ -647,7 +647,7 @@ Standard_Boolean TColStd_PackedMapOfInteger::Unite(const TColStd_PackedMapOfInte while (p1) { if (p1->IsEqual(aKeyInt)) { const size_t anOldPop = p1->NbValues(); - Standard_Integer newData = p1->Data() | p2->Data(); + unsigned int newData = p1->Data() | p2->Data(); if ( newData != p1->Data() ) { p1->ChangeData() = newData; aNewExtent = aNewExtent - anOldPop + diff --git a/src/TCollection/TCollection_AsciiString.cxx b/src/TCollection/TCollection_AsciiString.cxx index 8504eb5e1e..63d42253e5 100755 --- a/src/TCollection/TCollection_AsciiString.cxx +++ b/src/TCollection/TCollection_AsciiString.cxx @@ -424,8 +424,8 @@ void TCollection_AsciiString::AssignCat(const TCollection_AsciiString& other) void TCollection_AsciiString::Capitalize() { for (int i=0; i < mylength; i++) { - if ( i==0 ) mystring[i] = toupper(mystring[i]); - else mystring[i] = tolower(mystring[i]); + if ( i==0 ) mystring[i] = ::UpperCase(mystring[i]); + else mystring[i] = ::LowerCase(mystring[i]); } } @@ -457,9 +457,9 @@ void TCollection_AsciiString::ChangeAll(const Standard_Character aChar, if (mystring[i] == aChar) mystring[i] = NewChar; } else{ - Standard_Character anUpperChar = toupper(aChar); + Standard_Character anUpperChar = ::UpperCase(aChar); for (int i=0; i < mylength; i++) - if (toupper(mystring[i]) == anUpperChar) mystring[i] = NewChar; + if (::UpperCase(mystring[i]) == anUpperChar) mystring[i] = NewChar; } } @@ -1138,7 +1138,7 @@ Standard_Integer TCollection_AsciiString::Location void TCollection_AsciiString::LowerCase() { for (int i=0; i < mylength; i++) - mystring[i] = tolower(mystring[i]); + mystring[i] = ::LowerCase(mystring[i]); } //------------------------------------------------------------------------ @@ -1240,9 +1240,9 @@ void TCollection_AsciiString::RemoveAll(const Standard_Character what, if (mystring[i] != what) mystring[c++] = mystring[i]; } else { - Standard_Character upperwhat = toupper(what); + Standard_Character upperwhat = ::UpperCase(what); for (int i=0; i < mylength; i++) { - if (toupper(mystring[i]) != upperwhat) mystring[c++] = mystring[i]; + if (::UpperCase(mystring[i]) != upperwhat) mystring[c++] = mystring[i]; } } mylength = c; @@ -1831,7 +1831,7 @@ void TCollection_AsciiString::Trunc(const Standard_Integer ahowmany) void TCollection_AsciiString::UpperCase() { for (int i=0; i < mylength; i++) - mystring[i] = toupper(mystring[i]); + mystring[i] = ::UpperCase(mystring[i]); } //------------------------------------------------------------------------ diff --git a/src/TDF/TDF_Attribute.cxx b/src/TDF/TDF_Attribute.cxx index 9a34559738..1410eb9eb4 100755 --- a/src/TDF/TDF_Attribute.cxx +++ b/src/TDF/TDF_Attribute.cxx @@ -312,7 +312,7 @@ void TDF_Attribute::RemoveBackup() //purpose : Adds the referenced attributes or labels. //======================================================================= -void TDF_Attribute::References(const Handle(TDF_DataSet)& aDataSet) const +void TDF_Attribute::References(const Handle(TDF_DataSet)& /*aDataSet*/) const {} diff --git a/src/TDataStd/TDataStd_Directory.cxx b/src/TDataStd/TDataStd_Directory.cxx index 6e7df229b5..dcb745a0d3 100755 --- a/src/TDataStd/TDataStd_Directory.cxx +++ b/src/TDataStd/TDataStd_Directory.cxx @@ -37,7 +37,7 @@ Standard_Boolean TDataStd_Directory::Find (const TDF_Label& current, Handle(TDataStd_Directory) dir; if (L.IsNull()) return Standard_False; - while (1) { + for(;;) { if(L.FindAttribute(TDataStd_Directory::GetID(), dir)) break; L = L.Father(); if (L.IsNull()) break; diff --git a/src/TDataStd/TDataStd_NoteBook.cxx b/src/TDataStd/TDataStd_NoteBook.cxx index 9c90472cd2..826dc9b618 100755 --- a/src/TDataStd/TDataStd_NoteBook.cxx +++ b/src/TDataStd/TDataStd_NoteBook.cxx @@ -39,7 +39,7 @@ Standard_Boolean TDataStd_NoteBook::Find (const TDF_Label& current, Handle(TDataStd_NoteBook) NB; if (L.IsNull()) return Standard_False; - while (1) { + for(;;) { if(L.FindAttribute(TDataStd_NoteBook::GetID(), NB)) break; L = L.Father(); if (L.IsNull()) break; diff --git a/src/TDataXtd/TDataXtd_Shape.cxx b/src/TDataXtd/TDataXtd_Shape.cxx index e247f33447..92714e2cb5 100755 --- a/src/TDataXtd/TDataXtd_Shape.cxx +++ b/src/TDataXtd/TDataXtd_Shape.cxx @@ -42,7 +42,7 @@ Standard_Boolean TDataXtd_Shape::Find (const TDF_Label& current, TDF_Label L = current; Handle(TDataXtd_Shape) SA; if (L.IsNull()) return Standard_False; - while (1) { + for(;;) { if(L.FindAttribute(TDataXtd_Shape::GetID(), SA)) break; L = L.Father(); if (L.IsNull()) break; diff --git a/src/TFunction/TFunction_Function.cxx b/src/TFunction/TFunction_Function.cxx index 101719e2f0..7669d37cd1 100755 --- a/src/TFunction/TFunction_Function.cxx +++ b/src/TFunction/TFunction_Function.cxx @@ -172,7 +172,7 @@ Handle(TDF_Attribute) TFunction_Function::NewEmpty() const //purpose : Collects the references //======================================================================= -void TFunction_Function::References(const Handle(TDF_DataSet)& aDataSet) const +void TFunction_Function::References(const Handle(TDF_DataSet)& /*aDataSet*/) const { } diff --git a/src/TNaming/TNaming_UsedShapes.cxx b/src/TNaming/TNaming_UsedShapes.cxx index 69e851c964..ea7c1b3b89 100755 --- a/src/TNaming/TNaming_UsedShapes.cxx +++ b/src/TNaming/TNaming_UsedShapes.cxx @@ -184,6 +184,6 @@ Standard_OStream& TNaming_UsedShapes::Dump(Standard_OStream& anOS) const //purpose : //======================================================================= -void TNaming_UsedShapes::References(const Handle(TDF_DataSet)& aDataSet) const +void TNaming_UsedShapes::References(const Handle(TDF_DataSet)& /*aDataSet*/) const { } diff --git a/src/TPrsStd/TPrsStd_ConstraintTools.cxx b/src/TPrsStd/TPrsStd_ConstraintTools.cxx index c8c67eb829..8b44afdcaa 100755 --- a/src/TPrsStd/TPrsStd_ConstraintTools.cxx +++ b/src/TPrsStd/TPrsStd_ConstraintTools.cxx @@ -1965,7 +1965,7 @@ void TPrsStd_ConstraintTools::ComputePlacement //purpose : //======================================================================= void TPrsStd_ConstraintTools::ComputeOthers -(const Handle(TDataXtd_Constraint)& aConst, +(const Handle(TDataXtd_Constraint)& /*aConst*/, Handle(AIS_InteractiveObject)& anAIS) { } diff --git a/src/TestTopOpe/FILES b/src/TestTopOpe/FILES index 4b87abb384..f1fb095654 100755 --- a/src/TestTopOpe/FILES +++ b/src/TestTopOpe/FILES @@ -12,6 +12,5 @@ TestTopOpe_MesureCommands.cxx TestTopOpe_HDSDisplayer.hxx TestTopOpe_HDSDisplayer.cxx TestTopOpe_HDSCommands.cxx -TestTopOpe_DSACommands.cxx TestTopOpe_CORCommands.cxx TestTopOpe_OtherCommands.cxx diff --git a/src/TestTopOpe/TestTopOpe.cxx b/src/TestTopOpe/TestTopOpe.cxx index c9058a6343..a4199b0eb6 100755 --- a/src/TestTopOpe/TestTopOpe.cxx +++ b/src/TestTopOpe/TestTopOpe.cxx @@ -49,7 +49,7 @@ void TestTopOpe::AllCommands(Draw_Interpretor& theCommands) TestTopOpe::HDSCommands(theCommands); TestTopOpe::MesureCommands(theCommands); TestTopOpe::CORCommands(theCommands); - TestTopOpe::DSACommands(theCommands); + //TestTopOpe::DSACommands(theCommands); TestTopOpe::OtherCommands(theCommands); TestTopOpeTools::AllCommands(theCommands); TestTopOpeDraw::AllCommands(theCommands); diff --git a/src/TestTopOpe/TestTopOpe_CORCommands.cxx b/src/TestTopOpe/TestTopOpe_CORCommands.cxx index 694ea0330a..d1dd627056 100755 --- a/src/TestTopOpe/TestTopOpe_CORCommands.cxx +++ b/src/TestTopOpe/TestTopOpe_CORCommands.cxx @@ -827,9 +827,7 @@ static Standard_Integer normal(Draw_Interpretor& di, Standard_Integer n, const c // TopoDS_Face f = TopoDS::Face(DBRep::Get(a[1])); if (f.IsNull()) {di<<"null shape"<<"\n";return 1;} gp_Pnt p; DrawTrSurf::GetPoint(a[2], p); -#ifdef DEB - Standard_Real length = Draw::Atof(a[3]); -#endif + Standard_Real dist=0.; gp_Pnt2d uv; Standard_Boolean ok = FUN_tool_projPonF(p,f,uv,dist); if (!ok) {di<<"projection failed"<<"\n"; return 1;} #ifdef DEB diff --git a/src/TestTopOpe/TestTopOpe_DSACommands.cxx b/src/TestTopOpe/TestTopOpe_DSACommands.cxx deleted file mode 100755 index 11da71f126..0000000000 --- a/src/TestTopOpe/TestTopOpe_DSACommands.cxx +++ /dev/null @@ -1,167 +0,0 @@ -// Created on: 1997-12-01 -// Created by: Prestataire Mary FABIEN -// Copyright (c) 1997-1999 Matra Datavision -// Copyright (c) 1999-2012 OPEN CASCADE SAS -// -// The content of this file is subject to the Open CASCADE Technology Public -// License Version 6.5 (the "License"). You may not use the content of this file -// except in compliance with the License. Please obtain a copy of the License -// at http://www.opencascade.org and read it completely before using this file. -// -// The Initial Developer of the Original Code is Open CASCADE S.A.S., having its -// main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France. -// -// The Original Code and all software distributed under the License is -// distributed on an "AS IS" basis, without warranty of any kind, and the -// Initial Developer hereby disclaims all such warranties, including without -// limitation, any warranties of merchantability, fitness for a particular -// purpose or non-infringement. Please see the License for the specific terms -// and conditions governing the rights and limitations under the License. - - - -#include -#include -#include -#include - -Standard_Integer DSACCESSCOMMANDS(Draw_Interpretor& interpretor,Standard_Integer na, const char** a) -{ - static BRepAlgo_DSAccess DSA; -// Standard_Integer i; - - if (!strcmp(a[0],"dsload")) - if (na == 3) { - TopoDS_Shape SS1 = DBRep::Get(a[1]); - TopoDS_Shape& S1 = SS1; - TopoDS_Shape SS2 = DBRep::Get(a[2]); - TopoDS_Shape& S2 = SS2; - TestTopOpe::CurrentDS(DSA.DS()); - DSA.Load(S1, S2); - return 0; - } - else - return 0; - - else if(!strcmp(a[0],"dsinit")) { - DSA.Init(); - } - else if(!strcmp(a[0],"dsinters")) - if (na == 4) - if(!strcmp(a[1],"-sd")) { - const TopoDS_Shape& S1 = DBRep::Get(a[2]); - const TopoDS_Shape& S2 = DBRep::Get(a[3]); - DSA.SameDomain(S1, S2); - } - else - return 0; - else { - if(na == 3) { - const TopoDS_Shape& S1 = DBRep::Get(a[1]); - const TopoDS_Shape& S2 = DBRep::Get(a[2]); - DSA.Intersect(S1, S2); - } - else - if(na == 1) - DSA.Intersect(); - } - else if(!strcmp(a[0],"dsgetsect")) { - if((na == 2) || (na == 4)) { - TopoDS_Shape EmptyShape; - const TopoDS_Shape& S1 = ((na == 2) ? EmptyShape : DBRep::Get(a[2])); - const TopoDS_Shape& S2 = ((na == 2) ? EmptyShape : DBRep::Get(a[3])); - const TopTools_ListOfShape& list = - ((na == 2) ? DSA.GetSectionEdgeSet() : - DSA.GetSectionEdgeSet(S1, S2)); - Standard_Integer index = 1; - if(list.Extent() > 1) { - TopTools_ListIteratorOfListOfShape it(list); - for(; it.More(); it.Next(), index++) { - TCollection_AsciiString enam(a[1]); - enam=enam + "_" + TCollection_AsciiString(index); - DBRep::Set(enam.ToCString(),it.Value()); - } - } - else - if(list.Extent() == 1) { - TCollection_AsciiString enam(a[1]); - DBRep::Set(enam.ToCString(),list.First()); - } - else - return 0; - } - } - - else if(!strcmp(a[0],"dssuppsect")) { - if(na == 2) { - const TopoDS_Shape& S = DBRep::Get(a[1]); - DSA.SuppressEdgeSet(S); - } - else - return 0; - } - - else if(!strcmp(a[0],"dsperform")) { - if(na == 3) { - TopoDS_Shape S; - TCollection_AsciiString enam(a[1]); - if(!strcmp(enam.ToCString(),"fus")) - S = DSA.Merge(TopAbs_OUT, TopAbs_OUT); - else if(!strcmp(enam.ToCString(),"c12")) - S = DSA.Merge(TopAbs_OUT, TopAbs_IN); - else if(!strcmp(enam.ToCString(),"c21")) - S = DSA.Merge(TopAbs_IN, TopAbs_OUT); - else if(!strcmp(enam.ToCString(),"com")) - S = DSA.Merge(TopAbs_IN, TopAbs_IN); - DBRep::Set(a[2], S); - TopOpeBRepDS_DataStructure& DS = DSA.DS()->ChangeDS(); - Standard_Integer i,j,nbsh = DS.NbShapes(); - for(i = 1;i<=nbsh;i++) { - TopTools_ListOfShape& los = DS.ChangeShapeSameDomain(i); - j = los.Extent(); - - TopTools_ListIteratorOfListOfShape li(los); - for(; li.More(); li.Next()) { -#ifdef DEB - const TopoDS_Shape& Shap = -#endif - li.Value(); - } - } - } - else - return 0; - } - - else if(!strcmp(a[0],"dshelp")) { - - interpretor<<"\n"; - interpretor<<" dsinit"<<"\n"; - interpretor<<" dsload shape1 shape2"<<"\n"; - interpretor<<" dsinters [-sd] [f1 f2]"<<"\n"; - interpretor<<" if -sd, the faces are samedomain"<<"\n"; - interpretor<<" no argument = intersect two input Shapes"<<"\n"; - interpretor<<" dsgetsect result [f1 f2] (result = compound)"<<"\n"; - interpretor<<" dssuppsect comp"<<"\n"; - interpretor<<" dsperform fus/c12/c21/com resultShape "<<"\n"; - interpretor<<"\n"; - - return 0; - } - return 0; -} -//======================================================================= -//function : BOOPCommands -//purpose : -//======================================================================= -void TestTopOpe::DSACommands(Draw_Interpretor& theCommands) -{ - const char* g = "TestTopOpe DSACommands"; - theCommands.Add("dsinit","Taper dshelp",__FILE__,DSACCESSCOMMANDS,g); - theCommands.Add("dsload","Taper dshelp",__FILE__,DSACCESSCOMMANDS,g); - theCommands.Add("dsinters","Taper dshelp",__FILE__,DSACCESSCOMMANDS,g); - theCommands.Add("dsgetsect","Taper dshelp",__FILE__,DSACCESSCOMMANDS,g); - theCommands.Add("dssuppsect","Taper dshelp",__FILE__,DSACCESSCOMMANDS,g); - theCommands.Add("dsperform","Taper dshelp",__FILE__,DSACCESSCOMMANDS,g); - theCommands.Add("dshelp","Taper dshelp",__FILE__,DSACCESSCOMMANDS,g); -} diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_OtherCommands.cxx b/src/TestTopOpeDraw/TestTopOpeDraw_OtherCommands.cxx index ecf06faa68..f80ccd26b3 100755 --- a/src/TestTopOpeDraw/TestTopOpeDraw_OtherCommands.cxx +++ b/src/TestTopOpeDraw/TestTopOpeDraw_OtherCommands.cxx @@ -227,7 +227,7 @@ static void BoopReadInitFile(Draw_Interpretor& di, const char* filename) di.EvalFile(filename); } -static Standard_Integer ttab(Draw_Interpretor& di, Standard_Integer narg, const char** a) { +static Standard_Integer ttab(Draw_Interpretor& di, Standard_Integer narg, const char** /*a*/) { char s[2000]; strcpy(s,""); Sprintf(s,"%s%s",s,"proc addt {at args} {upvar $at x;set L \"\";addl L [join $args];"); Sprintf(s,"%s%s",s,"foreach l $L {set x([array size x]) $l}};"); diff --git a/src/TopOpeBRep/TopOpeBRep_EdgesFiller.cxx b/src/TopOpeBRep/TopOpeBRep_EdgesFiller.cxx index 849bf1fec3..0f4e16c66f 100755 --- a/src/TopOpeBRep/TopOpeBRep_EdgesFiller.cxx +++ b/src/TopOpeBRep/TopOpeBRep_EdgesFiller.cxx @@ -73,7 +73,7 @@ void TopOpeBRep_EdgesFiller::Insert(const TopoDS_Shape& E1,const TopoDS_Shape& E myLI1.Clear(); myLI2.Clear(); myHDS = HDS; - + #ifdef DEB Standard_Boolean trc = TopOpeBRepDS_GettraceDSF(); trc = trc || TopOpeBRepDS_GettraceEDSF(); @@ -84,20 +84,11 @@ void TopOpeBRep_EdgesFiller::Insert(const TopoDS_Shape& E1,const TopoDS_Shape& E myPEI->Dump(str,myPDS->Shape(myE1),myPDS->Shape(myE2)); } #endif - -#ifdef DEB - Standard_Boolean hs = -#endif - myPEI->HasSegment(); Standard_Boolean esd = myPEI->SameDomain(); if (esd) myPDS->FillShapesSameDomain(E1,E2); // exit if no point. myPEI->InitPoint(); if ( !myPEI->MorePoint() ) return; - -#ifdef DEB - Standard_Boolean reducesegment = (hs && !esd); -#endif // --- Add in BDS Standard_Integer E1index = myPDS->AddShape(E1,1); @@ -119,9 +110,8 @@ void TopOpeBRep_EdgesFiller::Insert(const TopoDS_Shape& E1,const TopoDS_Shape& E Standard_Integer if2 = 0; if ( ! myF2.IsNull() ) if2 = myPDS->AddShape(myF2,2); #ifdef DEB - Standard_Boolean pointofsegment = + Standard_Boolean pointofsegment = P2D.IsPointOfSegment(); #endif - P2D.IsPointOfSegment(); #ifdef DEB if (trc) { @@ -129,7 +119,7 @@ void TopOpeBRep_EdgesFiller::Insert(const TopoDS_Shape& E1,const TopoDS_Shape& E else if (pointofsegment && !esd) debposnesd(); } #endif - + TopOpeBRepDS_Transition T1 = P2D.Transition(1); TopOpeBRepDS_Transition T2 = P2D.Transition(2); @@ -503,10 +493,6 @@ void TopOpeBRep_EdgesFiller::RecomputeInterferences(const TopoDS_Edge& E,TopOpeB Standard_Integer ifb = TU.IndexBefore(); Standard_Integer ifa = TU.IndexAfter(); const TopoDS_Face& fb = TopoDS::Face(myPDS->Shape(ifb)); -#ifdef DEB - const TopoDS_Face& fa = -#endif - TopoDS::Face(myPDS->Shape(ifa)); #ifdef DEB if (ifb != ifa) {cout<<"TopOpeBRep_EdgesFiller : ifb != ifa on E"< in BDS Standard_Integer FFindex = BDS.AddShape(FF,1); -#ifdef DEB - Standard_Integer EEindex = -#endif BDS.AddShape(EE,2); // --- get list of interferences connected to edges , diff --git a/src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx b/src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx index 63446a6a9d..eb6b403154 100755 --- a/src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx +++ b/src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx @@ -248,10 +248,6 @@ static Standard_Boolean FUN_findTF(const TopOpeBRepDS_PDataStructure pDS, if (!OOdone) return Standard_False; const TopoDS_Edge& E = TopoDS::Edge(pDS->Shape(iE)); -#ifdef DEB - const TopoDS_Face& F = -#endif - TopoDS::Face(pDS->Shape(iF)); const TopoDS_Face& OOF = TopoDS::Face(pDS->Shape(iOOF)); Standard_Real f,l; FUN_tool_bounds(E,f,l); @@ -943,7 +939,6 @@ void TopOpeBRep_FacesFiller::FillLineVPonR() Standard_Boolean tDSF = TopOpeBRepDS_GettraceDSF(); Standard_Boolean trline = Standard_False; #endif - // if a VP is on degenerated edge, adds the triplet // (vertex, closing edge, degenerated edge) to the // map as vertex for key. @@ -953,10 +948,10 @@ void TopOpeBRep_FacesFiller::FillLineVPonR() mykeptVPnbr = 0; - if (myLine->TypeLineCurve() == TopOpeBRep_RESTRICTION) { + if (myLine->TypeLineCurve() == TopOpeBRep_RESTRICTION) { #ifdef DEB if (trline) FUN_traceRLine(*myLine); -#endif +#endif ProcessRLine(); return; } @@ -966,11 +961,10 @@ void TopOpeBRep_FacesFiller::FillLineVPonR() if ( nINON == 0 ) { return; } - + #ifdef DEB if (trline) FUN_traceGLine(*myLine); #endif - myLineIsonEdge = LSameDomainERL(*myLine, myERL); // walking (case mouch1a 1 1) : line (vpfirst on 3,vplast on 0,nvpkept = 2) => kept @@ -982,9 +976,7 @@ void TopOpeBRep_FacesFiller::FillLineVPonR() else cout <<" geometric line not on edge"<tolef) tolef=tolef2; //jmb le 30 juillet 99. on ne multiplie pas la tolerance par la dimension de la piece - // Standard_Real tolbox = tolef*dx; - Standard_Real tolbox = tolef; - - Standard_Real tolmin = Precision::Confusion(); Deflection=0.01; MaxUV=0.01; diff --git a/src/V3d/V3d_View.cxx b/src/V3d/V3d_View.cxx index 8f2848d7fe..4bd8b4993c 100755 --- a/src/V3d/V3d_View.cxx +++ b/src/V3d/V3d_View.cxx @@ -1516,7 +1516,6 @@ void V3d_View::SetZSize(const Standard_Real Size) Standard_Real Front = MyViewContext.ZClippingFrontPlane() ; Standard_Real Back = MyViewContext.ZClippingBackPlane() ; - Standard_Real focale= Focale(); MyViewMapping.SetFrontPlaneDistance(Zmax) ; MyViewMapping.SetBackPlaneDistance(-Zmax) ; diff --git a/src/V3d/V3d_View_3.cxx b/src/V3d/V3d_View_3.cxx index 11b63f2bac..f48bd7c1a7 100755 --- a/src/V3d/V3d_View_3.cxx +++ b/src/V3d/V3d_View_3.cxx @@ -72,10 +72,7 @@ void V3d_View::Move(const Standard_Real Dx, const Standard_Real Dy, const Standa Zeye = Zrp*Zpn + Dx*XZ + Dy*YZ + Dz*ZZ ; Zrp = sqrt( Xeye*Xeye + Yeye*Yeye + Zeye*Zeye ) ; V3d_BadValue_Raise_if( Zrp <= 0. ,"V3d_View::Move:: Eye,At are Confused"); -#ifdef DEB - Standard_Real focale = -#endif - Focale(); + Prp.SetCoord(Xrp,Yrp,Zrp) ; MyViewMapping.SetProjectionReferencePoint(Prp) ; Xpn = Xeye / Zrp ; Ypn = Yeye / Zrp ; Zpn = Zeye / Zrp ; @@ -84,24 +81,8 @@ void V3d_View::Move(const Standard_Real Dx, const Standard_Real Dy, const Standa MyView->SetViewOrientation(MyViewOrientation) ; // Check ZClipping planes -#ifdef IMP020300 MyView->SetViewMapping(MyViewMapping) ; SetZSize(0.); -#else - Standard_Real Zmax,Xat,Yat,Zat ; - MyViewReferencePoint.Coord(Xat,Yat,Zat) ; - Xeye += Xat ; Yeye += Yat ; Zeye += Zat ; - Zmax = sqrt( Xeye*Xeye + Yeye*Yeye + Zeye*Zeye ) ; - if( Zmax > MyViewMapping.FrontPlaneDistance() && - MyProjModel == V3d_TPM_SCREEN ) { - SetZSize(2.*Zmax+Zmax*Zmargin) ; - } else { - if( MyType == V3d_PERSPECTIVE ) { - SetFocale(focale) ; - } - MyView->SetViewMapping(MyViewMapping) ; - } -#endif ImmediateUpdate(); } @@ -124,10 +105,6 @@ void V3d_View::Move(const Standard_Real Length, const Standard_Boolean Start) { Zrp = sqrt( Xeye*Xeye + Yeye*Yeye + Zeye*Zeye ) ; V3d_BadValue_Raise_if( Zrp <= 0. ,"V3d_View::Move:: Eye,At are Confused"); -#ifdef DEB - Standard_Real focale = -#endif - Focale(); Prp.SetCoord(Xrp,Yrp,Zrp) ; MyViewMapping.SetProjectionReferencePoint(Prp) ; Xpn = Xeye / Zrp ; Ypn = Yeye / Zrp ; Zpn = Zeye / Zrp ; diff --git a/src/ViewerTest/ViewerTest_OpenGlCommands.cxx b/src/ViewerTest/ViewerTest_OpenGlCommands.cxx index 567a9d8529..0084718ce1 100644 --- a/src/ViewerTest/ViewerTest_OpenGlCommands.cxx +++ b/src/ViewerTest/ViewerTest_OpenGlCommands.cxx @@ -170,7 +170,6 @@ void VUserDrawObj::Render(const Handle(OpenGl_Workspace)& theWorkspace) const { // To test linking against OpenGl_Workspace and all aspect classes const OpenGl_AspectLine* aLA = theWorkspace->AspectLine(0); - const OpenGl_AspectFace* aFA = theWorkspace->AspectFace(0); const OpenGl_AspectMarker* aMA = theWorkspace->AspectMarker(0); aMA->Type(); const OpenGl_AspectText* aTA = theWorkspace->AspectText(0); diff --git a/src/ViewerTest/ViewerTest_ViewerCommands.cxx b/src/ViewerTest/ViewerTest_ViewerCommands.cxx index 19b7de9232..271371e231 100755 --- a/src/ViewerTest/ViewerTest_ViewerCommands.cxx +++ b/src/ViewerTest/ViewerTest_ViewerCommands.cxx @@ -1806,7 +1806,6 @@ static LRESULT WINAPI AdvViewerWindowProc( HWND hwnd, if( !DragFirst ) { HDC hdc = GetDC( hwnd ); - HGDIOBJ anObj = SelectObject( hdc, GetStockObject( WHITE_PEN ) ); SelectObject( hdc, GetStockObject( HOLLOW_BRUSH ) ); SetROP2( hdc, R2_NOT ); Rectangle( hdc, X_ButtonPress, Y_ButtonPress, X_Motion, Y_Motion ); diff --git a/src/Voxel/Voxel_FastConverter.cxx b/src/Voxel/Voxel_FastConverter.cxx index 32c9eba36c..7c10282c22 100755 --- a/src/Voxel/Voxel_FastConverter.cxx +++ b/src/Voxel/Voxel_FastConverter.cxx @@ -208,7 +208,7 @@ Standard_Boolean Voxel_FastConverter::Convert(Standard_Integer& progress, // Convert TopLoc_Location L; - Standard_Integer iprogress = 0, prev_progress = 0; + Standard_Integer iprogress = 0; Standard_Integer n1, n2, n3; Standard_Integer ixmin, iymin, izmin, ixmax, iymax, izmax; Standard_Real xmin, ymin, zmin, xmax, ymax, zmax; @@ -346,7 +346,7 @@ Standard_Boolean Voxel_FastConverter::ConvertUsingSAT(Standard_Integer& pro // Convert TopLoc_Location L; - Standard_Integer iprogress = 0, prev_progress = 0; + Standard_Integer iprogress = 0; Standard_Integer n1, n2, n3; Standard_Integer ixmin, iymin, izmin, ixmax, iymax, izmax; Standard_Real xmin, ymin, zmin, xmax, ymax, zmax; diff --git a/src/VrmlData/VrmlData_Geometry.cxx b/src/VrmlData/VrmlData_Geometry.cxx index 421f4696c2..fb83e14897 100755 --- a/src/VrmlData/VrmlData_Geometry.cxx +++ b/src/VrmlData/VrmlData_Geometry.cxx @@ -568,7 +568,7 @@ VrmlData_ErrorStatus VrmlData_TextureCoordinate::Read aStatus = VrmlData_VrmlFormatError; else { theBuffer.LinePtr++; - while (~0) { + for(;;) { gp_XY anXY; if (!OK(aStatus, VrmlData_Scene::ReadLine(theBuffer))) break; @@ -657,7 +657,7 @@ VrmlData_ErrorStatus VrmlData_ArrayVec3d::ReadArray aStatus = VrmlData_VrmlFormatError; else { theBuffer.LinePtr++; - while (~0) { + for(;;) { gp_XYZ anXYZ; if (!OK(aStatus, VrmlData_Scene::ReadLine(theBuffer))) break; diff --git a/src/VrmlData/VrmlData_Scene.cxx b/src/VrmlData/VrmlData_Scene.cxx index b82cf5f420..ed91a58b88 100755 --- a/src/VrmlData/VrmlData_Scene.cxx +++ b/src/VrmlData/VrmlData_Scene.cxx @@ -305,7 +305,7 @@ VrmlData_Scene& VrmlData_Scene::operator << (Standard_IStream& theInput) // if (myStatus == StatusOK) // myStatus = ReadLine (aBuffer); // Read VRML data by nodes - while (~0) { + for(;;) { if (!VrmlData_Node::OK(myStatus, ReadLine(aBuffer))) { if (myStatus == VrmlData_EndOfFile) myStatus = VrmlData_StatusOK; diff --git a/src/VrmlData/VrmlData_ShapeConvert.cxx b/src/VrmlData/VrmlData_ShapeConvert.cxx index 68f02b2dc4..22ffec8cf4 100755 --- a/src/VrmlData/VrmlData_ShapeConvert.cxx +++ b/src/VrmlData/VrmlData_ShapeConvert.cxx @@ -235,7 +235,7 @@ void VrmlData_ShapeConvert::Convert (const Standard_Boolean theExtractFaces, TopLoc_Location aL; Standard_Boolean found = Standard_False; - for(i = 1; Standard_True; i++) { + for(i = 1; ; i++) { BRep_Tool::PolygonOnTriangulation(aEdge, aPT, aT, aL, i); diff --git a/src/WNT/EHDC.cxx b/src/WNT/EHDC.cxx index f46a4feea0..28bca44436 100755 --- a/src/WNT/EHDC.cxx +++ b/src/WNT/EHDC.cxx @@ -1020,7 +1020,7 @@ BOOL EHDC :: _DrawToEx ( PPOINT p ) { myIDDA = min( k, myIDDA ); HPEN hpo = SelectPen( myHDC, GetStockObject ( NULL_PEN ) ); - while ( TRUE ) { + for(;;) { if ( myPRlen == 0 ) { @@ -1090,7 +1090,7 @@ void EHDC :: _LineTo ( PPOINT p ) { ddap.pp = myDDA1; LineDDA ( myStart.x, myStart.y, p -> x, p -> y, &___auxDDAF, ( LPARAM )&ddap ); - while ( TRUE ) { + for(;;) { if ( myPRlen == 0 ) { diff --git a/src/WNT/WNT_Window.cxx b/src/WNT/WNT_Window.cxx index eb009533e5..11cab24c41 100755 --- a/src/WNT/WNT_Window.cxx +++ b/src/WNT/WNT_Window.cxx @@ -287,45 +287,6 @@ Standard_Boolean WNT_Window :: DoMapping () const { return Standard_True; } -static Standard_Boolean ConvertBitmap (HBITMAP theHBitmap, - Image_PixMap& thePixMap) -{ - // Get informations about the bitmap - BITMAP aBitmap; - if (GetObject (theHBitmap, sizeof(BITMAP), (LPSTR )&aBitmap) == 0) - { - return Standard_False; - } - - const Standard_Size aSizeRowBytes = Standard_Size(aBitmap.bmWidth) * 4; - if (!thePixMap.InitTrash (Image_PixMap::ImgBGR32, Standard_Size(aBitmap.bmWidth), Standard_Size(aBitmap.bmHeight), aSizeRowBytes)) - { - return Standard_False; - } - thePixMap.SetTopDown (false); - - // Setup image data - BITMAPINFOHEADER aBitmapInfo; - memset (&aBitmapInfo, 0, sizeof(BITMAPINFOHEADER)); - aBitmapInfo.biSize = sizeof(BITMAPINFOHEADER); - aBitmapInfo.biWidth = aBitmap.bmWidth; - aBitmapInfo.biHeight = aBitmap.bmHeight; // positive means bottom-up! - aBitmapInfo.biPlanes = 1; - aBitmapInfo.biBitCount = 32; // use 32bit for automatic word-alignment per row - aBitmapInfo.biCompression = BI_RGB; - - // Copy the pixels - HDC aDC = GetDC (NULL); - Standard_Boolean isSuccess = GetDIBits (aDC, theHBitmap, - 0, // first scan line to set - aBitmap.bmHeight, // number of scan lines to copy - thePixMap.ChangeData(), // array for bitmap bits - (LPBITMAPINFO )&aBitmapInfo, // bitmap data info - DIB_RGB_COLORS) != 0; - ReleaseDC (NULL, aDC); - return isSuccess; -} - //***// //******************************* Ratio **********************************// //***// diff --git a/src/XSDRAW/XSDRAW.cxx b/src/XSDRAW/XSDRAW.cxx index ab02f3dbc9..7f7d48de61 100755 --- a/src/XSDRAW/XSDRAW.cxx +++ b/src/XSDRAW/XSDRAW.cxx @@ -142,10 +142,7 @@ void XSDRAW::LoadDraw (Draw_Interpretor& theCommands) { char mess[100]; Sprintf (mess,command,varname); -#ifdef DEB - IFSelect_ReturnStatus stat = -#endif - thepilot->Execute (mess); + thepilot->Execute (mess); return 1; // stat ? } diff --git a/src/XSDRAWSTEP/XSDRAWSTEP.cxx b/src/XSDRAWSTEP/XSDRAWSTEP.cxx index 7a828e7df7..8a2cdcbaf5 100755 --- a/src/XSDRAWSTEP/XSDRAWSTEP.cxx +++ b/src/XSDRAWSTEP/XSDRAWSTEP.cxx @@ -571,7 +571,7 @@ static Standard_Integer stepfileunits (Draw_Interpretor& di, Standard_Integer ar TColStd_SequenceOfAsciiString anUnitSolidAngleNames; aStepReader.FileUnits( anUnitLengthNames,anUnitAngleNames,anUnitSolidAngleNames); - Standard_Integer i =1, nb = anUnitLengthNames.Length(); + Standard_Integer i =1; di<<"=====================================================\n"; di<<"LENTH Unit"<<"\n"; for( ; i <= anUnitLengthNames.Length() ; i++) diff --git a/src/XmlMDataStd/XmlMDataStd_IntegerArrayDriver.cxx b/src/XmlMDataStd/XmlMDataStd_IntegerArrayDriver.cxx index 4222d88749..9b97be4795 100755 --- a/src/XmlMDataStd/XmlMDataStd_IntegerArrayDriver.cxx +++ b/src/XmlMDataStd/XmlMDataStd_IntegerArrayDriver.cxx @@ -172,10 +172,9 @@ void XmlMDataStd_IntegerArrayDriver::Paste str.Allocate(12 * intArray.Length() + 1); Standard_Integer i = aL; - while (1) + for (;;) { - const Standard_Integer& intValue = intArray.Value(i); - iChar += Sprintf(&(str[iChar]), "%d ", intValue); + iChar += Sprintf(&(str[iChar]), "%d ", intArray.Value(i)); if (i >= anU) break; ++i; diff --git a/src/XmlMDataStd/XmlMDataStd_NamedDataDriver.cxx b/src/XmlMDataStd/XmlMDataStd_NamedDataDriver.cxx index eb4cfef45e..e4c5d10d60 100755 --- a/src/XmlMDataStd/XmlMDataStd_NamedDataDriver.cxx +++ b/src/XmlMDataStd/XmlMDataStd_NamedDataDriver.cxx @@ -733,7 +733,7 @@ void XmlMDataStd_NamedDataDriver::Paste(const Handle(TDF_Attribute)& theSource, //Value = Array TCollection_AsciiString aValueStr2; Standard_Integer j = anArr1.Lower(); - while (1) { + for(;;) { aValueStr2 += TCollection_AsciiString(anArr1.Value(j)); if (j >= anArr1.Upper()) break; aValueStr2 += ' '; @@ -762,7 +762,7 @@ void XmlMDataStd_NamedDataDriver::Paste(const Handle(TDF_Attribute)& theSource, //Value = Array TCollection_AsciiString aValueStr2; Standard_Integer j = anArr1.Lower(); - while (1) { + for(;;) { #ifndef OCC6010 aValueStr2 += TCollection_AsciiString(anArr1.Value(j)); #else diff --git a/src/XmlMDataStd/XmlMDataStd_RealArrayDriver.cxx b/src/XmlMDataStd/XmlMDataStd_RealArrayDriver.cxx index 926b161dba..46eacc945a 100755 --- a/src/XmlMDataStd/XmlMDataStd_RealArrayDriver.cxx +++ b/src/XmlMDataStd/XmlMDataStd_RealArrayDriver.cxx @@ -174,10 +174,9 @@ void XmlMDataStd_RealArrayDriver::Paste (const Handle(TDF_Attribute)& theSource, str.Allocate(25 * realArray.Length() + 1); Standard_Integer i = aL; - while (1) + for (;;) { - const Standard_Real& dblValue = realArray.Value(i); - iChar += Sprintf(&(str[iChar]), "%.17g ", dblValue); + iChar += Sprintf(&(str[iChar]), "%.17g ", realArray.Value(i)); if (i >= anU) break; ++i; diff --git a/src/XmlObjMgt/XmlObjMgt.cxx b/src/XmlObjMgt/XmlObjMgt.cxx index 86c8ed2479..802c8b0d33 100755 --- a/src/XmlObjMgt/XmlObjMgt.cxx +++ b/src/XmlObjMgt/XmlObjMgt.cxx @@ -239,7 +239,7 @@ void XmlObjMgt::SetTagEntryString (XmlObjMgt_DOMString& theTarget, memcpy (aTarget, aRefPrefix, sizeof (aRefPrefix) - 1); char * aTargetPtr = aTarget + (sizeof (aRefPrefix) - 1); - while (1) { + for(;;) { // Check for the end-of-string; find the delimeter ':' aPtr = strchr (aTagEntry, ':'); if (aPtr == NULL) break; diff --git a/src/gp/gp_GTrsf.cxx b/src/gp/gp_GTrsf.cxx index 4d770f28bf..86b5467977 100755 --- a/src/gp/gp_GTrsf.cxx +++ b/src/gp/gp_GTrsf.cxx @@ -81,7 +81,7 @@ void gp_GTrsf::Power (const Standard_Integer N) gp_XYZ Temploc = loc; // Standard_Real Tempscale = scale; gp_Mat Tempmatrix (matrix); - while (1) { + for(;;) { if (IsOdd(Npower)) { loc.Add (Temploc.Multiplied (matrix)); matrix.Multiply (Tempmatrix); diff --git a/src/gp/gp_GTrsf2d.cxx b/src/gp/gp_GTrsf2d.cxx index f206b07218..019af7e59a 100755 --- a/src/gp/gp_GTrsf2d.cxx +++ b/src/gp/gp_GTrsf2d.cxx @@ -98,7 +98,7 @@ void gp_GTrsf2d::Power (const Standard_Integer N) gp_XY Temploc = loc; // Standard_Real Tempscale = scale; gp_Mat2d Tempmatrix (matrix); - while (1) { + for(;;) { if (IsOdd(Npower)) { loc.Add (Temploc.Multiplied (matrix)); matrix.Multiply (Tempmatrix); diff --git a/src/gp/gp_Mat.cxx b/src/gp/gp_Mat.cxx index 7809aa28cd..d0af6c49cd 100755 --- a/src/gp/gp_Mat.cxx +++ b/src/gp/gp_Mat.cxx @@ -259,7 +259,7 @@ void gp_Mat::Power (const Standard_Integer N) if (Npower < 0) Npower = - Npower; Npower--; gp_Mat Temp = *this; - while (1) { + for(;;) { if (IsOdd(Npower)) Multiply (Temp); if (Npower == 1) break; Temp.Multiply (Temp); diff --git a/src/gp/gp_Mat2d.cxx b/src/gp/gp_Mat2d.cxx index 63b9e10852..84170790e6 100755 --- a/src/gp/gp_Mat2d.cxx +++ b/src/gp/gp_Mat2d.cxx @@ -141,7 +141,7 @@ void gp_Mat2d::Power (const Standard_Integer N) if (Npower < 0) Npower = - Npower; Npower--; gp_Mat2d Temp = *this; - while (1) { + for(;;) { if (IsOdd(Npower)) Multiply (Temp); if (Npower == 1) break; Temp.Multiply (Temp); diff --git a/src/gp/gp_Trsf.cxx b/src/gp/gp_Trsf.cxx index 32a3d7b579..f0fbccdec9 100755 --- a/src/gp/gp_Trsf.cxx +++ b/src/gp/gp_Trsf.cxx @@ -610,7 +610,7 @@ void gp_Trsf::Power (const Standard_Integer N) if (Npower < 0) Npower = - Npower; Npower--; gp_XYZ Temploc = loc; - while (1) { + for(;;) { if (IsOdd(Npower)) loc.Add (Temploc); if (Npower == 1) break; Temploc.Add (Temploc); @@ -623,7 +623,7 @@ void gp_Trsf::Power (const Standard_Integer N) Npower--; gp_XYZ Temploc = loc; Standard_Real Tempscale = scale; - while (1) { + for(;;) { if (IsOdd(Npower)) { loc.Add (Temploc.Multiplied(scale)); scale = scale * Tempscale; @@ -640,7 +640,7 @@ void gp_Trsf::Power (const Standard_Integer N) Npower--; gp_Mat Tempmatrix (matrix); if (loc.X() == 0.0 && loc.Y() == 0.0 && loc.Z() == 0.0) { - while (1) { + for(;;) { if (IsOdd(Npower)) matrix.Multiply (Tempmatrix); if (Npower == 1) break; Tempmatrix.Multiply (Tempmatrix); @@ -649,7 +649,7 @@ void gp_Trsf::Power (const Standard_Integer N) } else { gp_XYZ Temploc = loc; - while (1) { + for(;;) { if (IsOdd(Npower)) { loc.Add (Temploc.Multiplied (matrix)); matrix.Multiply (Tempmatrix); @@ -680,7 +680,7 @@ void gp_Trsf::Power (const Standard_Integer N) gp_XYZ Temploc = loc; Standard_Real Tempscale = scale; gp_Mat Tempmatrix (matrix); - while (1) { + for(;;) { if (IsOdd(Npower)) { loc.Add ((Temploc.Multiplied (matrix)).Multiplied (scale)); scale = scale * Tempscale; diff --git a/src/gp/gp_Trsf2d.cxx b/src/gp/gp_Trsf2d.cxx index 16770f39b8..74eaeb983c 100755 --- a/src/gp/gp_Trsf2d.cxx +++ b/src/gp/gp_Trsf2d.cxx @@ -310,7 +310,7 @@ void gp_Trsf2d::Power (const Standard_Integer N) if (Npower < 0) Npower = - Npower; Npower--; gp_XY Temploc = loc; - while (1) { + for(;;) { if (IsOdd(Npower)) loc.Add (Temploc); if (Npower == 1) break; Temploc.Add (Temploc); @@ -323,7 +323,7 @@ void gp_Trsf2d::Power (const Standard_Integer N) Npower--; gp_XY Temploc = loc; Standard_Real Tempscale = scale; - while (1) { + for(;;) { if (IsOdd(Npower)) { loc.Add (Temploc.Multiplied(scale)); scale = scale * Tempscale; @@ -340,7 +340,7 @@ void gp_Trsf2d::Power (const Standard_Integer N) Npower--; gp_Mat2d Tempmatrix (matrix); if (loc.X() == 0.0 && loc.Y() == 0.0) { - while (1) { + for(;;) { if (IsOdd(Npower)) matrix.Multiply (Tempmatrix); if (Npower == 1) break; Tempmatrix.Multiply (Tempmatrix); @@ -349,7 +349,7 @@ void gp_Trsf2d::Power (const Standard_Integer N) } else { gp_XY Temploc = loc; - while (1) { + for(;;) { if (IsOdd(Npower)) { loc.Add (Temploc.Multiplied (matrix)); matrix.Multiply (Tempmatrix); @@ -379,7 +379,7 @@ void gp_Trsf2d::Power (const Standard_Integer N) gp_XY Temploc = loc; Standard_Real Tempscale = scale; gp_Mat2d Tempmatrix (matrix); - while (1) { + for(;;) { if (IsOdd(Npower)) { loc.Add ((Temploc.Multiplied (matrix)).Multiplied (scale)); scale = scale * Tempscale; diff --git a/src/math/math_DirectPolynomialRoots.cxx b/src/math/math_DirectPolynomialRoots.cxx index b105f30ec3..84216ad42d 100755 --- a/src/math/math_DirectPolynomialRoots.cxx +++ b/src/math/math_DirectPolynomialRoots.cxx @@ -62,7 +62,7 @@ const Standard_Real ZERO = 1.0e-30; static Standard_Real Improve(const Standard_Integer N, Standard_Real *Poly, const Standard_Real IniSol) { - Standard_Real Val, Der, Delta; + Standard_Real Val = 0., Der, Delta; Standard_Real Sol = IniSol; Standard_Real IniVal = Value(N, Poly, IniSol); Standard_Integer Index; diff --git a/tests/bugs/begin b/tests/bugs/begin index f6008ef954..9dad5fa399 100755 --- a/tests/bugs/begin +++ b/tests/bugs/begin @@ -61,50 +61,50 @@ proc checkpoint {coord_x coord_y rd_ch gr_ch bl_ch} { set mistake 0 set i 0 while { $mistake != 1 && $i <= 5 } { - set j 0 - while { $mistake != 1 && $j <= 5 } { - set position_x [expr ${x_start} + $j] - set position_y [expr ${y_start} + $i] - puts $position_x - puts $position_y - global color2d - if { [info exists color2d] } { - set color [ QAAISGetPixelColor2d ${position_x} ${position_y} ] - } else { - set color [ QAGetPixelColor ${position_x} ${position_y} ] - } - regexp {RED +: +([-0-9.+eE]+)} $color full rd - regexp {GREEN +: +([-0-9.+eE]+)} $color full gr - regexp {BLUE +: +([-0-9.+eE]+)} $color full bl - set rd_int [expr int($rd * 1.e+05)] - set gr_int [expr int($gr * 1.e+05)] - set bl_int [expr int($bl * 1.e+05)] - - if { $rd_ch != 0 } { - set tol_rd [expr abs($rd_ch - $rd_int)/$rd_ch] - } else { - set tol_rd $rd_int - } - if { $gr_ch != 0 } { - set tol_gr [expr abs($gr_ch - $gr_int)/$gr_ch] - } else { - set tol_gr $gr_int - } - if { $bl_ch != 0 } { - set tol_bl [expr abs($bl_ch - $bl_int)/$bl_ch] - } else { - set tol_bl $bl_int - } + set j 0 + while { $mistake != 1 && $j <= 5 } { + set position_x [expr ${x_start} + $j] + set position_y [expr ${y_start} + $i] + puts $position_x + puts $position_y + global color2d + if { [info exists color2d] } { + set color [ QAAISGetPixelColor2d ${position_x} ${position_y} ] + } else { + set color [ QAGetPixelColor ${position_x} ${position_y} ] + } + regexp {RED +: +([-0-9.+eE]+)} $color full rd + regexp {GREEN +: +([-0-9.+eE]+)} $color full gr + regexp {BLUE +: +([-0-9.+eE]+)} $color full bl + set rd_int [expr int($rd * 1.e+05)] + set gr_int [expr int($gr * 1.e+05)] + set bl_int [expr int($bl * 1.e+05)] + + if { $rd_ch != 0 } { + set tol_rd [expr abs($rd_ch - $rd_int)/$rd_ch] + } else { + set tol_rd $rd_int + } + if { $gr_ch != 0 } { + set tol_gr [expr abs($gr_ch - $gr_int)/$gr_ch] + } else { + set tol_gr $gr_int + } + if { $bl_ch != 0 } { + set tol_bl [expr abs($bl_ch - $bl_int)/$bl_ch] + } else { + set tol_bl $bl_int + } - if { $tol_rd > 0.2 || $tol_gr > 0.2 || $tol_bl > 0.2 } { - puts "Warning : Point with true color was not found near default coordinates" - set mistake 0 - } else { - set mistake 1 - } - incr j - } - incr i + if { $tol_rd > 0.2 || $tol_gr > 0.2 || $tol_bl > 0.2 } { + puts "Warning : Point with true color was not found near default coordinates" + set mistake 0 + } else { + set mistake 1 + } + incr j + } + incr i } return $mistake } @@ -118,15 +118,15 @@ proc checkcolor { coord_x coord_y rd_get gr_get bl_get } { puts "BLUE color of RGB is $bl_get" if { $coord_x <= 1 || $coord_y <= 1 } { - puts "Error : minimal coordinate is x = 2, y = 2. But we have x = $coord_x y = $coord_y" - return -1 + puts "Error : minimal coordinate is x = 2, y = 2. But we have x = $coord_x y = $coord_y" + return -1 } global color2d - if { [info exists color2d] } { - set color [ QAAISGetPixelColor2d ${coord_x} ${coord_y} ] - } else { - set color [ QAGetPixelColor ${coord_x} ${coord_y} ] - } + if { [info exists color2d] } { + set color [ QAAISGetPixelColor2d ${coord_x} ${coord_y} ] + } else { + set color [ QAGetPixelColor ${coord_x} ${coord_y} ] + } regexp {RED +: +([-0-9.+eE]+)} $color full rd regexp {GREEN +: +([-0-9.+eE]+)} $color full gr @@ -139,51 +139,51 @@ proc checkcolor { coord_x coord_y rd_get gr_get bl_get } { set bl_ch [expr int($bl_get * 1.e+05)] if { $rd_ch != 0 } { - set tol_rd [expr abs($rd_ch - $rd_int)/$rd_ch] + set tol_rd [expr abs($rd_ch - $rd_int)/$rd_ch] } else { - set tol_rd $rd_int + set tol_rd $rd_int } if { $gr_ch != 0 } { - set tol_gr [expr abs($gr_ch - $gr_int)/$gr_ch] + set tol_gr [expr abs($gr_ch - $gr_int)/$gr_ch] } else { - set tol_gr $gr_int + set tol_gr $gr_int } if { $bl_ch != 0 } { - set tol_bl [expr abs($bl_ch - $bl_int)/$bl_ch] + set tol_bl [expr abs($bl_ch - $bl_int)/$bl_ch] } else { - set tol_bl $bl_int + set tol_bl $bl_int } set status 0 if { $tol_rd > 0.2 } { - puts "Warning : RED light of additive color model RGB is invalid" - set status 1 + puts "Warning : RED light of additive color model RGB is invalid" + set status 1 } if { $tol_gr > 0.2 } { - puts "Warning : GREEN light of additive color model RGB is invalid" - set status 1 + puts "Warning : GREEN light of additive color model RGB is invalid" + set status 1 } if { $tol_bl > 0.2 } { - puts "Warning : BLUE light of additive color model RGB is invalid" - set status 1 + puts "Warning : BLUE light of additive color model RGB is invalid" + set status 1 } if { $status != 0 } { - puts "Warning : Colors of default coordinate are not equal" + puts "Warning : Colors of default coordinate are not equal" } global stat if { $tol_rd > 0.2 || $tol_gr > 0.2 || $tol_bl > 0.2 } { - set info [checkpoint $coord_x $coord_y $rd_ch $gr_ch $bl_ch] - set stat [lindex $info end] - if { ${stat} != 1 } { - puts "Error : Colors are not equal in default coordinate and in the near coordinates too" - return $stat - } else { - puts "Point with valid color was found" - return $stat - } + set info [checkpoint $coord_x $coord_y $rd_ch $gr_ch $bl_ch] + set stat [lindex $info end] + if { ${stat} != 1 } { + puts "Error : Colors are not equal in default coordinate and in the near coordinates too" + return $stat + } else { + puts "Point with valid color was found" + return $stat + } } else { - set stat 1 + set stat 1 } } diff --git a/tests/bugs/end b/tests/bugs/end index 8e8bf0cedb..595dcc8870 100755 --- a/tests/bugs/end +++ b/tests/bugs/end @@ -2,9 +2,9 @@ if { [info exists square] } { set prop "square" set mass $square if { [info exists tol_square] } { - regexp {Mass +: +([-0-9.+eE]+)} [sprops result $tol_square] full m + regexp {Mass +: +([-0-9.+eE]+)} [sprops result $tol_square] full m } else { - regexp {Mass +: +([-0-9.+eE]+)} [sprops result] full m + regexp {Mass +: +([-0-9.+eE]+)} [sprops result] full m } } if { [info exists length] } { @@ -19,34 +19,34 @@ if { [info exists length] } { #if mass (length or square) is empty in test case then result should be an empty shape. if { [info exists mass] } { if { [string compare $subgroup "moddata"] != 0 } { - puts "checkshape" - checkshape result + puts "checkshape" + checkshape result } if { [string compare "$mass" "empty"] != 0 } { - if { $m == 0 } { - puts "Error : The command is not valid. The $prop is 0." - } - if { $mass > 0 } { - puts "The expected $prop is $mass" - } - #check of change of square is < 1% - if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > 0.01) || ($mass == 0 && $m != 0) } { - puts "Error : The $prop of result shape is $m" - } + if { $m == 0 } { + puts "Error : The command is not valid. The $prop is 0." + } + if { $mass > 0 } { + puts "The expected $prop is $mass" + } + #check of change of square is < 1% + if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > 0.01) || ($mass == 0 && $m != 0) } { + puts "Error : The $prop of result shape is $m" + } } else { - if { $m != 0 } { - puts "Error : The command is not valid. The $prop is $m" - } + if { $m != 0 } { + puts "Error : The command is not valid. The $prop is $m" + } } } set glob_inf [info global nb_*_good] if { [regexp "nb_.*_good" $glob_inf] == 1 } { if { [info exists nbsh_t] } { - set nb_info [nbshapes result -t] + set nb_info [nbshapes result -t] } else { - set nb_info [nbshapes result] + set nb_info [nbshapes result] } } @@ -146,18 +146,18 @@ if { [info exists rel_tol] } { puts "Error : area by triangles differs from the actual area by $rel_err %" } else { if { $rel_tol > 1 && $rel_tol < 100 } { - puts "Error: Improvement: The current area difference is $rel_err instead of $rel_tol" + puts "Error: Improvement: The current area difference is $rel_err instead of $rel_tol" } } } if { [isdraw result] } { if { [info exists 2dviewer] } { - clear - smallview - donly result - fit - xwd $imagedir/${test_image}.png + clear + smallview + donly result + fit + xwd $imagedir/${test_image}.png } if { [info exists 3dviewer] } { #for multiview support: dump result from all opened views diff --git a/tests/bugs/modalg_1/buc60462_2 b/tests/bugs/modalg_1/buc60462_2 index a58e92f993..0795dac246 100755 --- a/tests/bugs/modalg_1/buc60462_2 +++ b/tests/bugs/modalg_1/buc60462_2 @@ -1,7 +1,4 @@ -puts "TODO OCC12345 ALL: Faulty shapes in variables faulty_1 to faulty_" -puts "TODO OCC12345 ALL: Faulty : mistakes are found in checked shape by checkshape command" -puts "TODO OCC12345 ALL: Error : The square of result shape is" - +puts "TODO OCC12345 windows: Faulty shapes in variables faulty_1 to faulty_" puts "==========" puts "BUC60462" @@ -15,12 +12,7 @@ puts "Fuse begin" bfuse result a b puts "Fuse end" -set che [checkshape result r] -if { [regexp {OK} $che] != 1 } { - puts "Faulty : mistakes are found in checked shape by checkshape command" -} else { - puts "Checking by checkshape - OK" -} +checkshape result r -set square 0 +set square 89562.1 set 2dviewer 0