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

16
src/Blend/Blend_Walking_1.gxx
View File

@@ -472,8 +472,8 @@ Standard_Boolean Blend_Walking::Continu(Blend_Function& Func,
if (sens < 0.) {
Ext1 = line->StartPointOnFirst();
Ext2 = line->StartPointOnSecond();
if (OnS1 && Ext1.NbPointOnRst() == 0 ||
!OnS1 && Ext2.NbPointOnRst() == 0) {
if ((OnS1 && Ext1.NbPointOnRst() == 0) ||
(!OnS1 && Ext2.NbPointOnRst() == 0)) {
return Standard_False;
}
previousP = line->Point(1);
@@ -483,8 +483,8 @@ Standard_Boolean Blend_Walking::Continu(Blend_Function& Func,
else {
Ext1 = line->EndPointOnFirst();
Ext2 = line->EndPointOnSecond();
if (OnS1 && Ext1.NbPointOnRst() == 0 ||
!OnS1 && Ext2.NbPointOnRst() == 0) {
if ((OnS1 && Ext1.NbPointOnRst() == 0) ||
(!OnS1 && Ext2.NbPointOnRst() == 0)) {
return Standard_False;
}
previousP = line->Point(line->NbPoints());
@@ -505,16 +505,16 @@ Standard_Boolean Blend_Walking::Continu(Blend_Function& Func,
Standard_Integer newlength = line->NbPoints();
if (sens <0.) {
if (OnS1 && line->StartPointOnSecond().NbPointOnRst() == 0 ||
!OnS1 && line->StartPointOnFirst().NbPointOnRst() == 0) {
if ((OnS1 && line->StartPointOnSecond().NbPointOnRst() == 0) ||
(!OnS1 && line->StartPointOnFirst().NbPointOnRst() == 0)) {
line->Remove(1,newlength-length);
line->SetStartPoints(Ext1,Ext2);
return Standard_False;
}
}
else {
if (OnS1 && line->EndPointOnSecond().NbPointOnRst() == 0 ||
!OnS1 && line->EndPointOnFirst().NbPointOnRst() == 0) {
if ((OnS1 && line->EndPointOnSecond().NbPointOnRst() == 0) ||
(!OnS1 && line->EndPointOnFirst().NbPointOnRst() == 0)) {
line->Remove(length,newlength);
line->SetEndPoints(Ext1,Ext2);
return Standard_False;