Merge gromacs-4-6 into master

[alexxy/gromacs.git] / src / gromacs / mdlib / wall.c

diff --git a/src/gromacs/mdlib/wall.c b/src/gromacs/mdlib/wall.c
index 168d56a532d677e23800db06d6e673fc5024ec71..beb4d7cf5c34483e11bb6c93af59c9c12cef3c9d 100644 (file)
--- a/src/gromacs/mdlib/wall.c
+++ b/src/gromacs/mdlib/wall.c
@@ -169,7 +169,7 @@ real do_walls(t_inputrec *ir,t_forcerec *fr,matrix box,t_mdatoms *md,
                 at = type[i];
                 Cd = nbfp[ntw[w]+2*at];
                 Cr = nbfp[ntw[w]+2*at+1];
-                if (!((Cd==0 && Cr==0) || egp_flags[ggid] & EGP_EXCL))
+                if (!((Cd==0 && Cr==0) || (egp_flags[ggid] & EGP_EXCL)))
                 {
                     if (w == 0)
                     {