From 237b68378fdfe134362be0d4b5e89730ff6e4e00 Mon Sep 17 00:00:00 2001 From: Roland Schulz Date: Fri, 9 May 2014 12:57:53 -0400 Subject: [PATCH] Fix GCC 4.9 warnings Change-Id: I277d0f03f67dfbb5ca5785adc7e8f31880202b41 --- src/gromacs/gmxana/gmx_make_ndx.c | 6 +++++- src/gromacs/gmxlib/nonbonded/nonbonded.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gromacs/gmxana/gmx_make_ndx.c b/src/gromacs/gmxana/gmx_make_ndx.c index 79bbd23602..ea91754d51 100644 --- a/src/gromacs/gmxana/gmx_make_ndx.c +++ b/src/gromacs/gmxana/gmx_make_ndx.c @@ -846,8 +846,12 @@ static int split_chain(t_atoms *atoms, rvec *x, { rvec_sub(x[ca_end], x[i], vec); } + else + { + break; + } } - while ((i < natoms) && (norm(vec) < 0.45)); + while (norm(vec) < 0.45); end[nchain] = ca_end; while ((end[nchain]+1 < natoms) && diff --git a/src/gromacs/gmxlib/nonbonded/nonbonded.c b/src/gromacs/gmxlib/nonbonded/nonbonded.c index ad687f77b4..be1c17b36e 100644 --- a/src/gromacs/gmxlib/nonbonded/nonbonded.c +++ b/src/gromacs/gmxlib/nonbonded/nonbonded.c @@ -377,7 +377,7 @@ void do_nonbonded(t_forcerec *fr, nlist = nblists->nlist_sr; f = f_shortrange; } - else if (range == 1) + else { /* Long-range */ if (!(flags & GMX_NONBONDED_DO_LR)) -- 2.22.0