mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-09 13:22:24 +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:
@@ -210,10 +210,10 @@ static Standard_Boolean IsSameOriented(const TopoDS_Shape& aFace,
|
||||
//=======================================================================
|
||||
BRepFill_PipeShell::BRepFill_PipeShell(const TopoDS_Wire& Spine)
|
||||
: mySpine(Spine),
|
||||
myTrihedron(GeomFill_IsCorrectedFrenet),
|
||||
myTransition(BRepFill_Modified),
|
||||
myTrihedron(GeomFill_IsCorrectedFrenet),
|
||||
myForceApproxC1(Standard_False),
|
||||
myStatus(GeomFill_PipeOk)
|
||||
myTransition(BRepFill_Modified),
|
||||
myStatus(GeomFill_PipeOk)
|
||||
{
|
||||
myLocation.Nullify();
|
||||
mySection.Nullify();
|
||||
|
@@ -2259,26 +2259,27 @@ BRepFill_Sweep::BRepFill_Sweep(const Handle(BRepFill_SectionLaw)& Section,
|
||||
}
|
||||
}
|
||||
|
||||
if (ipath == 1)
|
||||
if (uclose && (isec == NbLaw)) {
|
||||
Vertex(isec+1, 1) = Vertex(1, 1);
|
||||
}
|
||||
else if (Vertex(isec+1, 1).IsNull()) {
|
||||
if (constSection)
|
||||
myLoc->PerformVertex(IPath-1,
|
||||
TopoDS::Vertex(SecVertex(isec+1)),
|
||||
TabErr(isec,1)+VError(isec+1),
|
||||
TopoDS::Vertex(Vertex(isec+1, 1)) );
|
||||
else
|
||||
myLoc->PerformVertex(IPath-1,
|
||||
mySec->Vertex(isec+1,Vi(1)),
|
||||
TabErr(isec,1) +
|
||||
mySec->VertexTol(isec,Vi(1)),
|
||||
TopoDS::Vertex(Vertex(isec+1, 1)) );
|
||||
if (MergeVertex(Vertex(isec,1), Vertex(isec+1,1))) {
|
||||
VEdge(isec, 1) = NullEdge(Vertex(isec, 1));
|
||||
}
|
||||
}
|
||||
if (ipath == 1) {
|
||||
if (uclose && (isec == NbLaw)) {
|
||||
Vertex(isec+1, 1) = Vertex(1, 1);
|
||||
}
|
||||
else if (Vertex(isec+1, 1).IsNull()) {
|
||||
if (constSection)
|
||||
myLoc->PerformVertex(IPath-1,
|
||||
TopoDS::Vertex(SecVertex(isec+1)),
|
||||
TabErr(isec,1)+VError(isec+1),
|
||||
TopoDS::Vertex(Vertex(isec+1, 1)) );
|
||||
else
|
||||
myLoc->PerformVertex(IPath-1,
|
||||
mySec->Vertex(isec+1,Vi(1)),
|
||||
TabErr(isec,1) +
|
||||
mySec->VertexTol(isec,Vi(1)),
|
||||
TopoDS::Vertex(Vertex(isec+1, 1)) );
|
||||
if (MergeVertex(Vertex(isec,1), Vertex(isec+1,1))) {
|
||||
VEdge(isec, 1) = NullEdge(Vertex(isec, 1));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (uclose && (isec == NbLaw)) {
|
||||
Vertex(isec+1, ipath+1) = Vertex(1, ipath+1);
|
||||
|
Reference in New Issue
Block a user