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

9
src/AppParCurves/AppParCurves_Variational_7.gxx
View File

@@ -150,12 +150,7 @@ void AppParCurves_Variational::Adjusting(
j1cibl = Sqrt(myCriterium[0] / (NbrPnt - NbrConstraint));
vseuil = Sqrt(vocri[1]) + (erold - myMaxError) * 4;
// if(CNew->NbElements() == TheCurve->NbElements())
lrejet = myMaxError > WQuality && myMaxError > erold * 1.01
|| Sqrt(myCriterium[1]) > vseuil * 1.05;
// else
// lrejet = myMaxError > WQuality && myMaxError > erold * 1.05
// || Sqrt(myCriterium[1]) > vseuil * 1.01;
lrejet = ((myMaxError > WQuality) && (myMaxError > erold * 1.01)) || (Sqrt(myCriterium[1]) > vseuil * 1.05);
if (lrejet) {
myCriterium[0] = vocri[0];
@@ -175,7 +170,7 @@ void AppParCurves_Variational::Adjusting(
/* (7) Test de convergence */
if (iter >= mxiter && myMaxSegment == CNew->NbElements() || myMaxError < WQuality) {
if (((iter >= mxiter) && (myMaxSegment == CNew->NbElements())) || myMaxError < WQuality) {
loptim = Standard_False;
}