Merge branch 'cran-warnings' into 'master'

[IPhreeqc] added parens for clang++ -Wlogical-op-parentheses

See merge request coupled/IPhreeqc!6
This commit is contained in:
Scott R Charlton 2018-08-14 21:02:41 -06:00
commit a56973f604

View File

@ -973,8 +973,8 @@ void Phreeqc::
print_punch(int i, boolean active)
/* ---------------------------------------------------------------------- */
{
if (!(cell_data[i].punch && (transport_step % punch_modulus == 0)) &&
!(cell_data[i].print && (transport_step % print_modulus == 0)) ||
if ((!(cell_data[i].punch && (transport_step % punch_modulus == 0)) &&
!(cell_data[i].print && (transport_step % print_modulus == 0))) ||
(bcon_first == 2 && i == 0) ||
(bcon_last == 2 && i == count_cells + 1))
return;