1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-04 13:13:25 +03:00

0024171: Eliminate CLang compiler warning -Wreorder

Got rid of -Wreorder warning (wrong fields' initialization order); some warnings -Wdangling-else are also fixed
This commit is contained in:
omy
2013-09-12 11:30:34 +04:00
committed by abv
parent 105aae761e
commit eafb234bf1
63 changed files with 608 additions and 456 deletions

View File

@@ -264,10 +264,11 @@ static Standard_Integer stwire (Draw_Interpretor& di, Standard_Integer argc, con
if (BRep_Tool::Degenerated(E)) di<<" DGNR";
if (sbwd->IsSeam(i)) di<<" SEAM_WIRE";
if (Shape.ShapeType() == TopAbs_FACE &&
sae.IsSeam(E,TopoDS::Face(Shape))) di<<" SEAM_FACE";
if (Shape.ShapeType() == TopAbs_FACE )
if (sae.HasPCurve(E,TopoDS::Face(Shape))) di<<" PCU";
else di<<" NO_PCU";
sae.IsSeam(E,TopoDS::Face(Shape))) di<<" SEAM_FACE";
if (Shape.ShapeType() == TopAbs_FACE ) {
if (sae.HasPCurve(E,TopoDS::Face(Shape))) di<<" PCU";
else di<<" NO_PCU";
}
if (sae.HasCurve3d(E)) di<<" C3D";
else di<<" NO_C3D";
if (sae.IsClosed3d(E)) di<<" CLOSED";

View File

@@ -1150,21 +1150,25 @@ static Standard_Integer splitface
Standard_Real Umin, Umax, Vmin, Vmax;
S->Bounds ( Umin, Umax, Vmin, Vmax );
if ( Uf < Umin && ! S->IsUPeriodic() ) Uf = Umin;
else if ( Uf > Umin )
else if ( Uf > Umin ) {
if ( Precision::IsInfinite(Umin) ) Uf -= 100;
else Uf = Umin;
}
if ( Vf < Vmin && ! S->IsVPeriodic() ) Vf = Vmin;
else if ( Vf > Vmin )
else if ( Vf > Vmin ) {
if ( Precision::IsInfinite(Vmin) ) Vf -= 100;
else Vf = Vmin;
}
if ( Ul > Umax && ! S->IsUPeriodic() ) Ul = Umax;
else if ( Ul < Umax )
else if ( Ul < Umax ) {
if ( Precision::IsInfinite(Umax) ) Ul += 100;
else Ul = Umax;
}
if ( Vl > Vmax && ! S->IsVPeriodic() ) Vl = Vmax;
else if ( Vl < Vmax )
else if ( Vl < Vmax ) {
if ( Precision::IsInfinite(Vmax) ) Vl += 100;
else Vl = Vmax;
}
TColStd_SequenceOfReal uval;
TColStd_SequenceOfReal vval;