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

0024177: Eliminate CLang compiler warning -Wlogical-op-parentheses (&& within ||)

Browse Source 
Some fixes to eliminate warning
This commit is contained in:
omy
2013-09-16 13:22:20 +04:00
committed by bugmaster
parent e97ea58f01
commit 0ebaa4dbc9
47 changed files with 197 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/TopOpeBRepBuild/TopOpeBRepBuild_GridEE.cxx
View File

@@ -684,7 +684,7 @@ void TopOpeBRepBuild_Builder::GFillPointTopologyPVS(const TopoDS_Shape& E,
// xpu110398 cto 009 L2 : e6ou en v11
// xpu140898 USA60111 : e9ou (!=0) + e7ou(=0)
Standard_Boolean INTEXT = (oriI == TopAbs_INTERNAL) && (TB == TopAbs_IN);
INTEXT = INTEXT || (oriI == TopAbs_EXTERNAL) && (TB == TopAbs_OUT);
INTEXT = INTEXT || ((oriI == TopAbs_EXTERNAL) && (TB == TopAbs_OUT));
kpbound = lesmemes && Eclosed && INTEXT;
if ( kpbound ) {
kpbound = vclo.IsSame(VIG);

5
src/TopOpeBRepBuild/TopOpeBRepBuild_GridSS.cxx
View File

@@ -1331,8 +1331,9 @@ static Standard_Boolean AreFacesCoincideInArea (const TopoDS_Shape& theBaseFace,
Standard_Real tolE = BRep_Tool::Tolerance(aE);
if (tolE > maxDist) maxDist = tolE;
if (aE.IsEqual(anEdge) ||
aE.Orientation() != TopAbs_FORWARD && aE.Orientation() != TopAbs_REVERSED &&
aE.IsSame(anEdge))
(aE.Orientation() != TopAbs_FORWARD &&
aE.Orientation() != TopAbs_REVERSED &&
aE.IsSame(anEdge)))
continue; // the same pcurve
Handle(Geom2d_Curve) PC = BRep_Tool::CurveOnSurface(aE,aBaseFace,pf,pl);
if (PC.IsNull()) {

26
src/TopOpeBRepBuild/TopOpeBRepBuild_Section.cxx
View File

@@ -305,23 +305,23 @@ void TopOpeBRepBuild_Builder::SplitSectionEdges()
Standard_Integer nLESDspon = LESDspon.Extent();
if ( nLEspon != 0 && nLESDspon != 0 ) {
Standard_Boolean takeE = (rE == 1 && iESD != iRef || iE == iRef);
pE1 = takeE ? &E : &ESD;
pE2 = !takeE ? &E : &ESD;
plos1 = takeE ? &LEspon : &LESDspon;
plos2 = !takeE ? &LEspon : &LESDspon;
Standard_Boolean takeE = ((rE == 1 && iESD != iRef) || iE == iRef);
pE1 = takeE ? &E : &ESD;
pE2 = !takeE ? &E : &ESD;
plos1 = takeE ? &LEspon : &LESDspon;
plos2 = !takeE ? &LEspon : &LESDspon;
}
else if ( nLEspon != 0 ) {
pE1 = &E;
pE2 = &ESD;
plos1 = &LEspon;
plos2 = &LESDspon;
pE1 = &E;
pE2 = &ESD;
plos1 = &LEspon;
plos2 = &LESDspon;
}
else if ( nLESDspon != 0 ) {
pE1 = &ESD;
pE2 = &E;
plos1 = &LESDspon;
plos2 = &LEspon;
pE1 = &ESD;
pE2 = &E;
plos1 = &LESDspon;
plos2 = &LEspon;
}
if (pE1 == NULL || pE2 == NULL) continue;