OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0023947: Eliminate trivial compiler warnings in MSVC++ with warning level 4

Browse Source 
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
This commit is contained in:
omy
2013-07-12 12:37:38 +04:00
parent a8195d65ba
commit 302f96fb0d
189 changed files with 455 additions and 1010 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/TopOpeBRepTool/TopOpeBRepTool_CORRISO.cxx
View File

@@ -156,10 +156,11 @@ Standard_Boolean TopOpeBRepTool_CORRISO::Init(const TopoDS_Shape& S)
const TopoDS_Edge& E = TopoDS::Edge(ex.Current());
#ifdef DEB
Standard_Integer iE = STATIC_PURGE_mapeds.Add(E);
#ifdef DRAW
if (trc) {TCollection_AsciiString aa = TCollection_AsciiString("e"); FUN_tool_draw(aa,E,iE);}
#endif
#ifdef DRAW
if (trc) {TCollection_AsciiString aa = TCollection_AsciiString("e"); FUN_tool_draw(aa,E,iE);}
#endif
#endif
// myEds :
myEds.Append(E);
@@ -176,12 +177,12 @@ Standard_Boolean TopOpeBRepTool_CORRISO::Init(const TopoDS_Shape& S)
// myVEds :
TopExp_Explorer exv(E, TopAbs_VERTEX);
for (; exv.More(); exv.Next()){
const TopoDS_Vertex& v = TopoDS::Vertex(exv.Current());
const TopoDS_Vertex& v = TopoDS::Vertex(exv.Current());
#ifdef DEB
Standard_Integer iv = STATIC_PURGE_mapv.Add(v);
#ifdef DRAW
if (trc) {TCollection_AsciiString bb = TCollection_AsciiString("v"); FUN_tool_draw(bb,v,iv);}
#endif
Standard_Integer iE = STATIC_PURGE_mapeds.Add(E);
#ifdef DRAW
if (trc) {TCollection_AsciiString bb = TCollection_AsciiString("v"); FUN_tool_draw(bb,v,iv);}
#endif
#endif
Standard_Boolean isb = myVEds.IsBound(v);
if (isb) myVEds.ChangeFind(v).Append(E);
@@ -344,15 +345,8 @@ static Standard_Boolean FUN_isonOcE(const TopOpeBRepTool_CORRISO CO, const TopoD
TopOpeBRepTool_C2DF OcE2d; Standard_Boolean isOb = CO.UVRep(OcE,OcE2d);
if (!isOb) return Standard_False; // NYIRAISE
#ifdef DEB
const TopoDS_Vertex& vce1 =
#endif
TopoDS::Vertex(vcE(1));
Standard_Real parvce1 = TopOpeBRepTool_TOOL::ParE(1,cE); gp_Pnt2d UVvce1 = TopOpeBRepTool_TOOL::UVF(parvce1,cE2d);
#ifdef DEB
const TopoDS_Vertex& vOce2 =
#endif
TopoDS::Vertex(vOcE(2));
Standard_Real parvOcE2 = TopOpeBRepTool_TOOL::ParE(2,OcE); gp_Pnt2d UVvOcE2 = TopOpeBRepTool_TOOL::UVF(parvOcE2,OcE2d);
Standard_Real tol = Max(tttuvcE,tttuvOcE);
isonOcE2d = (UVvce1.Distance(UVvOcE2) < tol);
@@ -419,20 +413,13 @@ Standard_Boolean TopOpeBRepTool_CORRISO::PurgeFyClosingE(const TopTools_ListOfSh
TopOpeBRepTool_C2DF OcE2d; Standard_Boolean isOb = UVRep(OcE,OcE2d);
if (!isOb) return Standard_False; // NYIRAISE
#ifdef DEB
const TopoDS_Vertex& vce1 =
#endif
TopoDS::Vertex(vcE(1));
Standard_Real parvce1 = TopOpeBRepTool_TOOL::ParE(1,cE); gp_Pnt2d UVvce1 = TopOpeBRepTool_TOOL::UVF(parvce1,cE2d);
#ifdef DEB
const TopoDS_Vertex& vOce2 =
#endif
TopoDS::Vertex(vOcE(2));
Standard_Real parvOcE2 = TopOpeBRepTool_TOOL::ParE(2,OcE); gp_Pnt2d UVvOcE2 = TopOpeBRepTool_TOOL::UVF(parvOcE2,OcE2d);
Standard_Real tol = Max(tttuvcE,tttuvOcE);
isoncE = (UVvce1.Distance(UVvOcE2) < tol);
if (isoncE && (nfy != 1)) {// cto009L2
return Standard_False;
return Standard_False;
}
}
@@ -531,14 +518,9 @@ Standard_Boolean TopOpeBRepTool_CORRISO::PurgeFyClosingE(const TopTools_ListOfSh
Standard_Real tttuvOcE = Max(Tol(1,tttolOcE),Tol(2,tttolOcE));
TopOpeBRepTool_C2DF OcE2d; Standard_Boolean isOb = UVRep(OcE,OcE2d);
if (!isOb) return Standard_False; // NYIRAISE
#ifdef DEB
const TopoDS_Vertex& vce1 = TopoDS::Vertex(vcE(1));
#endif
Standard_Real parvce1 = TopOpeBRepTool_TOOL::ParE(1,cE); gp_Pnt2d UVvce1 = TopOpeBRepTool_TOOL::UVF(parvce1,cE2d);
#ifdef DEB
const TopoDS_Vertex& vOce2 =
#endif
TopoDS::Vertex(vOcE(2));
Standard_Real parvOcE2 = TopOpeBRepTool_TOOL::ParE(2,OcE); gp_Pnt2d UVvOcE2 = TopOpeBRepTool_TOOL::UVF(parvOcE2,OcE2d);
Standard_Real tol = Max(tttuvcE,tttuvOcE);
isonOcE2d = (UVvce1.Distance(UVvOcE2) < tol);
@@ -840,17 +822,14 @@ Standard_Boolean TopOpeBRepTool_CORRISO::EdgeWithFaultyUV(const TopoDS_Edge& E,
for (TopTools_ListIteratorOfListOfShape ite(loe); ite.More(); ite.Next()) {
const TopoDS_Edge& e = TopoDS::Edge(ite.Value());
TopAbs_Orientation oe = e.Orientation();
#ifdef DEB
Standard_Integer ie = STATIC_PURGE_mapeds.Add(e);
if (trc) {cout<<" : on e"<<ie<<endl;}
#endif
if (e.IsSame(E)) continue;
if (M_INTERNAL(oe) || M_EXTERNAL(oe)) continue;
#ifdef DEB
Standard_Real tttole =
Standard_Integer ie = STATIC_PURGE_mapeds.Add(e);
if (trc) {cout<<" : on e"<<ie<<endl;}
#endif
BRep_Tool::Tolerance(e);
if (e.IsSame(E)) continue;
if (M_INTERNAL(oe) || M_EXTERNAL(oe)) continue;
Standard_Boolean isb = myERep2d.IsBound(e);
if (!isb) {FUN_RaiseError(); return Standard_False;}

9
src/TopOpeBRepTool/TopOpeBRepTool_TOPOLOGY.cxx
View File

@@ -1047,14 +1047,7 @@ Standard_EXPORT Standard_Boolean FUN_tool_pcurveonF(const TopoDS_Face& fF,TopoDS
Standard_Real tole = BRep_Tool::Tolerance(e);
TopoDS_Vertex vf,vl; TopExp::Vertices(e,vf,vl);
#ifdef DEB
Standard_Real parf =
#endif
BRep_Tool::Parameter(vf,e);
#ifdef DEB
Standard_Real parl =
#endif
BRep_Tool::Parameter(vl,e);
TopoDS_Edge newe = faultyE;
// TopoDS_Edge newe; FUN_ds_CopyEdge(e,newe); newe.Orientation(TopAbs_FORWARD);
// vf.Orientation(TopAbs_FORWARD); BB.Add(newe,vf); FUN_ds_Parameter(newe,vf,parf);

4
src/TopOpeBRepTool/TopOpeBRepTool_tol.cxx
View File

@@ -111,10 +111,6 @@ Standard_EXPORT void FTOL_FaceTolerances
Standard_Real tolef= tolef1;
if (tolef2>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;