1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +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

@@ -451,9 +451,10 @@ TopAbs_State TopTrans_SurfaceTransition::StateBefore() const
// we take the state before of after orientations
before = ::FUN_getstate(myAng,myOri,AFTER,BEFORE);
// eap Mar 25 2002
if (myTouchFlag)
if (myTouchFlag) {
if (before == TopAbs_OUT) before = TopAbs_IN;
else if (before == TopAbs_IN) before = TopAbs_OUT;
}
}
return before;
}
@@ -467,9 +468,10 @@ TopAbs_State TopTrans_SurfaceTransition::StateAfter() const
// looking back in before for defined states
after = ::FUN_getstate(myAng,myOri,BEFORE,AFTER);
// eap Mar 25 2002
if (myTouchFlag)
if (myTouchFlag) {
if (after == TopAbs_OUT) after = TopAbs_IN;
else if (after == TopAbs_IN) after = TopAbs_OUT;
}
}
return after;
}