OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

0026788: Compiler warnings when OCCT_DEBUG is enabled

Browse Source 
Clean-up in code causing warnings when OCCT_DEBUG is enabled

Minor corrections:
- new compiler warnings on VC++ 14
- rename of "PPC" variables that are said to caused conflicts on PowerPC
- removal of unused header TopOpeBRep/TopOpeBRep_tools.hxx
This commit is contained in:
abv 2015-10-20 14:04:55 +03:00 committed by bugmaster
parent 5f07d05d0e
commit 7636352267
22 changed files with 70 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/BOPTools/BOPTools_AlgoTools2D_1.cxx
View File

@ -294,7 +294,8 @@ Standard_Boolean IsToReverse(const TopoDS_Edge& aEold,
aCnew->D1(aTnew, aP, aVnew);
aVnew.Normalize();
//
aCtx->ProjectPointOnEdge(aP, aEold, aTold);
if (!aCtx->ProjectPointOnEdge(aP, aEold, aTold))
return Standard_False;
aCold->D1(aTold, aP, aVold);
aVold.Normalize();
//

3
src/BRepFeat/BRepFeat_RibSlot.cxx
View File

@ -1073,9 +1073,8 @@ Standard_Boolean BRepFeat_RibSlot::ExtremeFaces(const Standard_Boolean RevolRib,
Handle(Geom_TrimmedCurve) curve;
curve = new Geom_TrimmedCurve(Cur, f, l, Standard_True);
#ifdef OCCT_DEBUG
gp_Pnt P1 =
gp_Pnt P1 = BRep_Tool::Pnt(TopExp::FirstVertex(E,Standard_True)); (void)P1;
#endif
BRep_Tool::Pnt(TopExp::FirstVertex(E,Standard_True));
gp_Pnt P2 = BRep_Tool::Pnt(TopExp::LastVertex(E,Standard_True));
ex1.Init(mySbase, TopAbs_FACE);
TopoDS_Vertex theVertex;

19
src/BRepFill/BRepFill_CompatibleWires.cxx
View File

@ -462,17 +462,20 @@ static Standard_Boolean EdgeIntersectOnWire (const gp_Pnt& P1,
if (DSS.IsDone()) {
// choose the solution closest to P2
Standard_Integer isol = 1;
Standard_Real dss = P2.Distance(DSS.PointOnShape2(isol));
gp_Pnt Psol = DSS.PointOnShape2(isol);
Standard_Real dss = P2.Distance(Psol);
for (Standard_Integer iss=2; iss<=DSS.NbSolution(); iss++) {
if (dss>P2.Distance(DSS.PointOnShape2(iss))) {
dss = P2.Distance(DSS.PointOnShape2(iss));
isol = iss;
gp_Pnt Pss = DSS.PointOnShape2(iss);
Standard_Real aDist = P2.Distance(Pss);
if (dss > aDist) {
dss = aDist;
isol = iss;
#ifdef OCCT_DEBUG
Psol = Pss;
#endif
}
}
#ifdef OCCT_DEBUG
gp_Pnt Psol =
#endif
DSS.PointOnShape2(isol);
// is the solution a new vertex ?
NewVertex = (DSS.SupportTypeShape2(isol) != BRepExtrema_IsVertex);
if (NewVertex) {

3
src/BRepTopAdaptor/BRepTopAdaptor_FClass2d.cxx
View File

@ -192,9 +192,8 @@ BRepTopAdaptor_FClass2d::BRepTopAdaptor_FClass2d(const TopoDS_Face& aFace,const
//-- Try to remote the first point of the current edge
//-- from the last saved point
#ifdef OCCT_DEBUG
gp_Pnt2d Pnt2dDebutEdgeCourant=
gp_Pnt2d Pnt2dDebutEdgeCourant = C.Value(u); (void)Pnt2dDebutEdgeCourant;
#endif
C.Value(u);
//Standard_Real Baillement2dU=0;
//Standard_Real Baillement2dV=0;

6
src/BinTools/BinTools_ShapeSet.cxx
View File

@ -795,15 +795,13 @@ void BinTools_ShapeSet::ReadGeometry(const TopAbs_ShapeEnum T,
BinTools::GetReal(IS, X);
BinTools::GetReal(IS, Y);
BinTools::GetReal(IS, Z);
myBuilder.MakeVertex(V,gp_Pnt(X,Y,Z),tol);
gp_Pnt aPnt (X, Y, Z);
myBuilder.MakeVertex (V, aPnt, tol);
Handle(BRep_TVertex) TV = Handle(BRep_TVertex)::DownCast(V.TShape());
BRep_ListOfPointRepresentation& lpr = TV->ChangePoints();
TopLoc_Location L;
Standard_Boolean aNewF = (myFormatNb > 2) ? Standard_True : Standard_False;
#ifdef OCCT_DEBUG
gp_Pnt aPnt = gp_Pnt(X,Y,Z);
#endif
do {
if(aNewF) {
val = (Standard_Integer)IS.get();//case {0|1|2|3}

10
src/Bisector/Bisector_Inter.cxx
View File

@ -334,13 +334,13 @@ void Bisector_Inter::NeighbourPerform(const Handle(Bisector_BisecCC)& Bis1,
// Change guiedline on Bis2.
BisTemp = Bis2->ChangeGuide();
Guide = Bis2->Curve(2);
#ifdef OCCT_DEBUG
// note: returned points are not used in the code, but can be useful for consulting in debugger
gp_Pnt2d P2S = Bis2->ValueAndDist(D2.FirstParameter(),U1,UMax,Dist);
gp_Pnt2d P2E = Bis2->ValueAndDist(D2.LastParameter() ,U1,UMin,Dist);
#else
Bis2->ValueAndDist(D2.FirstParameter(),U1,UMax,Dist);
Bis2->ValueAndDist(D2.LastParameter() ,U1,UMin,Dist);
#endif
(void)P2S;
(void)P2E;
// Calculate the domain of intersection on the guideline.
UMin = Max (D1.FirstParameter(),UMin);
UMax = Min (D1.LastParameter() ,UMax);

2
src/Blend/Blend_Walking_4.gxx
View File

@ -681,10 +681,8 @@ void Blend_Walking::InternalPerform(Blend_Function& Func,
Arrive = Standard_True;
}
break;
#ifndef OCCT_DEBUG
default:
break;
#endif
}
if (Arrive) {
if (sens > 0.) {

2
src/DPrsStd/DPrsStd.cxx
View File

@ -63,7 +63,7 @@ static Standard_Boolean FoundCAFPlugin () {
// Define Environment Variable
char *plugin, *casroot, *standard;
const char *plugin, *casroot, *standard;
plugin = getenv("CSF_PluginDefaults");
standard = getenv("CSF_StandardDefaults");
casroot = getenv("CASROOT");

2
src/Draft/Draft_Modification_1.cxx
View File

@ -393,7 +393,7 @@ Standard_Boolean Draft_Modification::InternalAdd(const TopoDS_Face& F,
TopTools_MapIteratorOfMapOfShape itm(MapOfE);
for ( ; itm.More(); itm.Next())
{
Standard_Integer IndToReplace = myEMap.FindIndex(TopoDS::Edge(itm.Key()));
IndToReplace = myEMap.FindIndex(TopoDS::Edge(itm.Key()));
if ( IndToReplace )
{
Standard_Integer LInd = myEMap.Extent();

2
src/Geom/Geom_OffsetSurface.cxx
View File

@ -1633,7 +1633,7 @@ void Geom_OffsetSurface::SetD0(const Standard_Real U, const Standard_Real V,
D1U.SquareMagnitude() + D1V.SquareMagnitude() > MagTol * MagTol)
{
// Use non-null derivative as normal direction in degenerated case.
gp_Vec aNorm = D1U.SquareMagnitude() > MagTol * MagTol ? D1U : D1V;
aNorm = D1U.SquareMagnitude() > MagTol * MagTol ? D1U : D1V;
aNorm.Normalize();
P.SetXYZ(P.XYZ() + offsetValue * signe * aNorm.XYZ());

4
src/GeomFill/GeomFill_GuideTrihedronAC.cxx
View File

@ -247,9 +247,7 @@ GeomFill_GuideTrihedronAC::GeomFill_GuideTrihedronAC(const Handle(Adaptor3d_HCur
//derivee seconde du triedre
#ifdef OCCT_DEBUG
gp_Vec DTDN = DTo.Crossed(DNormal);
#else
DTo.Crossed(DNormal);
gp_Vec DTDN = DTo.Crossed(DNormal); (void)DTDN;
#endif
Standard_Real TN2 = TN.SquareMagnitude();

26
src/Plate/Plate_LinearScalarConstraint.cxx
View File

@ -34,27 +34,27 @@ Plate_LinearScalarConstraint::Plate_LinearScalarConstraint
myCoef->ChangeValue(1,1) = coeff;
}
Plate_LinearScalarConstraint::Plate_LinearScalarConstraint(const Plate_Array1OfPinpointConstraint& PPC,const TColgp_Array1OfXYZ& coeff)
Plate_LinearScalarConstraint::Plate_LinearScalarConstraint(const Plate_Array1OfPinpointConstraint& thePPC,const TColgp_Array1OfXYZ& theCoeff)
{
if(coeff.Length()!= PPC.Length()) Standard_DimensionMismatch::Raise();
myPPC = new Plate_HArray1OfPinpointConstraint(1,PPC.Length());
myCoef = new TColgp_HArray2OfXYZ(1,1,1,coeff.Length());
if(theCoeff.Length()!= thePPC.Length()) Standard_DimensionMismatch::Raise();
myPPC = new Plate_HArray1OfPinpointConstraint(1, thePPC.Length());
myCoef = new TColgp_HArray2OfXYZ(1,1,1, theCoeff.Length());
myPPC->ChangeArray1() = PPC;
for(Standard_Integer i = 1; i<= coeff.Length(); i++) {
myCoef->ChangeValue(1,i) = coeff(i+coeff.Lower()-1);
myPPC->ChangeArray1() = thePPC;
for(Standard_Integer i = 1; i<= theCoeff.Length(); i++) {
myCoef->ChangeValue(1,i) = theCoeff(i+ theCoeff.Lower()-1);
}
}
Plate_LinearScalarConstraint::Plate_LinearScalarConstraint
(const Plate_Array1OfPinpointConstraint& PPC,const TColgp_Array2OfXYZ& coeff)
(const Plate_Array1OfPinpointConstraint& thePPC,const TColgp_Array2OfXYZ& theCoeff)
{
if(coeff.RowLength()!= PPC.Length()) Standard_DimensionMismatch::Raise();
myPPC = new Plate_HArray1OfPinpointConstraint(1,PPC.Length());
myCoef = new TColgp_HArray2OfXYZ(1,coeff.ColLength(),1,coeff.RowLength());
if(theCoeff.RowLength()!= thePPC.Length()) Standard_DimensionMismatch::Raise();
myPPC = new Plate_HArray1OfPinpointConstraint(1, thePPC.Length());
myCoef = new TColgp_HArray2OfXYZ(1, theCoeff.ColLength(),1, theCoeff.RowLength());
myPPC->ChangeArray1() = PPC;
myCoef->ChangeArray2() = coeff;
myPPC->ChangeArray1() = thePPC;
myCoef->ChangeArray2() = theCoeff;
}

6
src/Plate/Plate_LinearScalarConstraint.hxx
View File

@ -44,11 +44,11 @@ public:
Standard_EXPORT Plate_LinearScalarConstraint();
Standard_EXPORT Plate_LinearScalarConstraint(const Plate_PinpointConstraint& PPC1, const gp_XYZ& coeff);
Standard_EXPORT Plate_LinearScalarConstraint(const Plate_PinpointConstraint& thePPC1, const gp_XYZ& theCoeff);
Standard_EXPORT Plate_LinearScalarConstraint(const Plate_Array1OfPinpointConstraint& PPC, const TColgp_Array1OfXYZ& coeff);
Standard_EXPORT Plate_LinearScalarConstraint(const Plate_Array1OfPinpointConstraint& thePPC, const TColgp_Array1OfXYZ& theCoeff);
Standard_EXPORT Plate_LinearScalarConstraint(const Plate_Array1OfPinpointConstraint& PPC, const TColgp_Array2OfXYZ& coeff);
Standard_EXPORT Plate_LinearScalarConstraint(const Plate_Array1OfPinpointConstraint& thePPC, const TColgp_Array2OfXYZ& theCoeff);
Standard_EXPORT Plate_LinearScalarConstraint(const Standard_Integer ColLen, const Standard_Integer RowLen);

26
src/Plate/Plate_LinearXYZConstraint.cxx
View File

@ -22,25 +22,25 @@
Plate_LinearXYZConstraint::Plate_LinearXYZConstraint() {}
Plate_LinearXYZConstraint::Plate_LinearXYZConstraint(const Plate_Array1OfPinpointConstraint& PPC,const TColStd_Array1OfReal& coeff)
Plate_LinearXYZConstraint::Plate_LinearXYZConstraint(const Plate_Array1OfPinpointConstraint& thePPC,const TColStd_Array1OfReal& theCoeff)
{
if(coeff.Length()!= PPC.Length()) Standard_DimensionMismatch::Raise();
myPPC = new Plate_HArray1OfPinpointConstraint(1,PPC.Length());
myCoef = new TColStd_HArray2OfReal(1,1,1,coeff.Length());
if(theCoeff.Length()!= thePPC.Length()) Standard_DimensionMismatch::Raise();
myPPC = new Plate_HArray1OfPinpointConstraint(1, thePPC.Length());
myCoef = new TColStd_HArray2OfReal(1,1,1, theCoeff.Length());
myPPC->ChangeArray1() = PPC;
for(Standard_Integer i = 1; i<= coeff.Length(); i++)
myCoef->ChangeValue(1,i) = coeff(i+coeff.Lower()-1);
myPPC->ChangeArray1() = thePPC;
for(Standard_Integer i = 1; i<= theCoeff.Length(); i++)
myCoef->ChangeValue(1,i) = theCoeff(i+ theCoeff.Lower()-1);
}
Plate_LinearXYZConstraint::Plate_LinearXYZConstraint(const Plate_Array1OfPinpointConstraint& PPC,const TColStd_Array2OfReal& coeff)
Plate_LinearXYZConstraint::Plate_LinearXYZConstraint(const Plate_Array1OfPinpointConstraint& thePPC,const TColStd_Array2OfReal& theCoeff)
{
if(coeff.RowLength()!= PPC.Length()) Standard_DimensionMismatch::Raise();
myPPC = new Plate_HArray1OfPinpointConstraint(1,PPC.Length());
myCoef = new TColStd_HArray2OfReal(1,coeff.ColLength(),1,coeff.RowLength());
if(theCoeff.RowLength()!= thePPC.Length()) Standard_DimensionMismatch::Raise();
myPPC = new Plate_HArray1OfPinpointConstraint(1, thePPC.Length());
myCoef = new TColStd_HArray2OfReal(1, theCoeff.ColLength(),1, theCoeff.RowLength());
myPPC->ChangeArray1() = PPC;
myCoef->ChangeArray2() = coeff;
myPPC->ChangeArray1() = thePPC;
myCoef->ChangeArray2() = theCoeff;
}

4
src/Plate/Plate_LinearXYZConstraint.hxx
View File

@ -45,9 +45,9 @@ public:
Standard_EXPORT Plate_LinearXYZConstraint();
Standard_EXPORT Plate_LinearXYZConstraint(const Plate_Array1OfPinpointConstraint& PPC, const TColStd_Array1OfReal& coeff);
Standard_EXPORT Plate_LinearXYZConstraint(const Plate_Array1OfPinpointConstraint& thePPC, const TColStd_Array1OfReal& theCoeff);
Standard_EXPORT Plate_LinearXYZConstraint(const Plate_Array1OfPinpointConstraint& PPC, const TColStd_Array2OfReal& coeff);
Standard_EXPORT Plate_LinearXYZConstraint(const Plate_Array1OfPinpointConstraint& thePPC, const TColStd_Array2OfReal& theCoeff);
Standard_EXPORT Plate_LinearXYZConstraint(const Standard_Integer ColLen, const Standard_Integer RowLen);

2
src/ProjLib/ProjLib_ComputeApprox.cxx
View File

@ -48,7 +48,7 @@
#include <DrawTrSurf.hxx>
#endif
#ifdef OCCT_DEBUG
static Standard_Boolean AffichValue = Standard_False;
//static Standard_Boolean AffichValue = Standard_False;
#endif
//=======================================================================

28
src/TestTopOpe/TestTopOpe_CORCommands.cxx
View File

@ -791,30 +791,6 @@ static Standard_Integer shapeclassifier(Draw_Interpretor& di, Standard_Integer n
return 0;
}
// normals ..
static Standard_Integer normal(Draw_Interpretor& di, Standard_Integer n, const char** a)
{
if (n < 3) return 1;
TopoDS_Shape aLocalShape = DBRep::Get(a[1]);
TopoDS_Face f = TopoDS::Face(aLocalShape);
// 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);
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 OCCT_DEBUG
gp_Vec ngf =
#endif
FUN_tool_nggeomF(uv,f);
TCollection_AsciiString aa("ngS");
#ifdef DRAW
FUN_tool_draw(aa,p,ngf,length);
#endif
return 0;
}
static Standard_Integer curvature(Draw_Interpretor& di, Standard_Integer n, const char** a)
{
if (n < 5) return 1;
@ -893,7 +869,5 @@ void TestTopOpe::CORCommands(Draw_Interpretor& theCommands)
theCommands.Add("projponf",
"projponf f pnt [extrema flag: -min/-max/-minmax] [extrema algo: -g(grad)/-t(tree)]",
__FILE__, projponf, g);
theCommands.Add("normal", "normal f p3d length", __FILE__, normal, g);
theCommands.Add("curvature", "curvature f x y z", __FILE__, curvature , g);
theCommands.Add("curvature", "curvature f x y z", __FILE__, curvature , g);
}

1
src/TopOpeBRep/FILES
View File

@ -72,7 +72,6 @@ TopOpeBRep_ShapeIntersector2d.hxx
TopOpeBRep_ShapeScanner.cxx
TopOpeBRep_ShapeScanner.hxx
TopOpeBRep_sort.cxx
TopOpeBRep_tools.hxx
TopOpeBRep_trace.cxx
TopOpeBRep_traceALWL.cxx
TopOpeBRep_traceBOOPNINT.cxx

5
src/TopOpeBRep/TopOpeBRep_FaceEdgeFiller.cxx
View File

@ -73,7 +73,6 @@ void TopOpeBRep_FaceEdgeFiller::Insert
TopOpeBRepDS_DataStructure& BDS = HDS->ChangeDS();
TopAbs_Orientation FFori = FF.Orientation();
TopAbs_Orientation EEori = EE.Orientation();
// --- Add <FF,EE> in BDS
Standard_Integer FFindex = BDS.AddShape(FF,1);
@ -91,9 +90,9 @@ void TopOpeBRep_FaceEdgeFiller::Insert
Standard_Real parE = FEINT.Parameter();
#ifdef OCCT_DEBUG
TopOpeBRepDS_Transition TFF =
TopAbs_Orientation EEori = EE.Orientation();
TopOpeBRepDS_Transition TFF = FEINT.Transition(1,EEori); (void)TFF;
#endif
FEINT.Transition(1,EEori); // EEori bidon = EXTERNAL
TopOpeBRepDS_Transition TEE = FEINT.Transition(2,FFori);
TEE.Index(FFindex);

21
src/TopOpeBRep/TopOpeBRep_tools.hxx
View File

@ -1,21 +0,0 @@
// Created on: 1997-11-28
// Created by: Jean Yves LEBEY
// Copyright (c) 1997-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#ifndef _TopOpeBRep_tools_HeaderFile
#define _TopOpeBRep_tools_HeaderFile
#include <TopOpeBRepDS_tools.hxx>
#endif

17
src/ViewerTest/ViewerTest.cxx
View File

@ -4595,9 +4595,7 @@ Standard_Boolean ViewerTest::PickObjects(Handle(TColStd_HArray1OfTransient)& ar
}
// step 2 : wait for the selection...
// Standard_Boolean IsGood (Standard_False);
// Standard_Integer NbPick(0);
Standard_Boolean NbPickGood (0),NbToReach(arr->Length());
Standard_Integer NbPickGood (0),NbToReach(arr->Length());
Standard_Integer NbPickFail(0);
Standard_Integer argccc = 5;
const char *bufff[] = { "A", "B", "C","D", "E" };
@ -4607,7 +4605,7 @@ Standard_Boolean ViewerTest::PickObjects(Handle(TColStd_HArray1OfTransient)& ar
while(NbPickGood<NbToReach && NbPickFail <= MaxPick){
while(ViewerMainLoop(argccc,argvvv)){}
Standard_Integer NbStored = TheAISContext()->NbSelected();
if((unsigned int ) NbStored != NbPickGood)
if(NbStored != NbPickGood)
NbPickGood= NbStored;
else
NbPickFail++;
@ -4616,7 +4614,8 @@ Standard_Boolean ViewerTest::PickObjects(Handle(TColStd_HArray1OfTransient)& ar
// step3 get result.
if((unsigned int ) NbPickFail >= NbToReach) return Standard_False;
if (NbPickFail >= NbToReach)
return Standard_False;
Standard_Integer i(0);
for(TheAISContext()->InitSelected();
@ -4769,8 +4768,7 @@ Standard_Boolean ViewerTest::PickShapes (const TopAbs_ShapeEnum TheType,
}
// step 2 : wait for the selection...
Standard_Boolean NbPickGood (0),NbToReach(thearr->Length());
Standard_Integer NbPickGood (0),NbToReach(thearr->Length());
Standard_Integer NbPickFail(0);
Standard_Integer argccc = 5;
const char *bufff[] = { "A", "B", "C","D", "E" };
@ -4780,7 +4778,7 @@ Standard_Boolean ViewerTest::PickShapes (const TopAbs_ShapeEnum TheType,
while(NbPickGood<NbToReach && NbPickFail <= MaxPick){
while(ViewerMainLoop(argccc,argvvv)){}
Standard_Integer NbStored = TheAISContext()->NbSelected();
if((unsigned int ) NbStored != NbPickGood)
if (NbStored != NbPickGood)
NbPickGood= NbStored;
else
NbPickFail++;
@ -4789,7 +4787,8 @@ Standard_Boolean ViewerTest::PickShapes (const TopAbs_ShapeEnum TheType,
// step3 get result.
if((unsigned int ) NbPickFail >= NbToReach) return Standard_False;
if (NbPickFail >= NbToReach)
return Standard_False;
Standard_Integer i(0);
for(TheAISContext()->InitSelected();TheAISContext()->MoreSelected();TheAISContext()->NextSelected()){

2
src/ViewerTest/ViewerTest_RelationCommands.cxx
View File

@ -1694,7 +1694,7 @@ static int VLenghtDimension(Draw_Interpretor& di, Standard_Integer argc, const c
gp_Pnt A=BRep_Tool::Pnt(aVertex1);
#ifdef OCCT_DEBUG
gp_Pnt C = BRep_Tool::Pnt(aVertex2);
gp_Pnt C = BRep_Tool::Pnt(aVertex2); (void)C;
#endif
gp_Pnt aProjB = aDeltaVertexFace.Point(1);