diff options
| author | Brad King <brad.king@kitware.com> | 2009-09-11 12:18:15 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2009-09-11 12:18:15 (GMT) |
| commit | b41a548d86f8989e790f0150abd3eb337e8c03d0 (patch) | |
| tree | e22e5e910e1b5769e8bcec6fa20ac703df013e55 /Source/cmExecuteProcessCommand.cxx | |
| parent | e0df0495e5b313e1f017ebb938c4522db6d5b89c (diff) | |
| download | CMake-b41a548d86f8989e790f0150abd3eb337e8c03d0.zip CMake-b41a548d86f8989e790f0150abd3eb337e8c03d0.tar.gz CMake-b41a548d86f8989e790f0150abd3eb337e8c03d0.tar.bz2 | |
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.
Diffstat (limited to 'Source/cmExecuteProcessCommand.cxx')
| -rw-r--r-- | Source/cmExecuteProcessCommand.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmExecuteProcessCommand.cxx b/Source/cmExecuteProcessCommand.cxx index 3b09e48..28ad80d 100644 --- a/Source/cmExecuteProcessCommand.cxx +++ b/Source/cmExecuteProcessCommand.cxx @@ -298,8 +298,8 @@ bool cmExecuteProcessCommand while((p = cmsysProcess_WaitForData(cp, &data, &length, 0), p)) { // Put the output in the right place. - if(p == cmsysProcess_Pipe_STDOUT && !output_quiet || - p == cmsysProcess_Pipe_STDERR && !error_quiet && merge_output) + if((p == cmsysProcess_Pipe_STDOUT && !output_quiet) || + (p == cmsysProcess_Pipe_STDERR && !error_quiet && merge_output)) { if(output_variable.empty()) { |