Add parentheses around '&&' between '||' for gcc

The GNU compiler warns about possible operator precedence mistakes and
asks for explicit parentheses (-Wparentheses).  We add the parentheses
to silence the warning.  This also fixes one real logic error in the
find_package() implementation by correcting expression evaluation order.

1 files changed, 7 insertions, 7 deletions

diff --git a/Source/cmCMakeMinimumRequired.cxx b/Source/cmCMakeMinimumRequired.cxx
index 49860c5..f3fad85 100644
--- a/Source/cmCMakeMinimumRequired.cxx
+++ b/Source/cmCMakeMinimumRequired.cxx
@@ -87,12 +87,12 @@ bool cmCMakeMinimumRequired
     }
 
   // Compare the version numbers.
-  if(current_major < required_major ||
-     current_major == required_major &&
-     current_minor < required_minor ||
-     current_major == required_major &&
-     current_minor == required_minor &&
-     current_patch < required_patch)
+  if((current_major < required_major) ||
+     (current_major == required_major &&
+      current_minor < required_minor) ||
+     (current_major == required_major &&
+      current_minor == required_minor &&
+      current_patch < required_patch))
     {
     // The current version is too low.
     cmOStringStream e;
@@ -110,7 +110,7 @@ bool cmCMakeMinimumRequired
     return false;
     }
 
-  if (required_major < 2 || required_major == 2 && required_minor < 4)
+  if (required_major < 2 || (required_major == 2 && required_minor < 4))
   {
     this->Makefile->SetPolicyVersion("2.4");
   }