Fix int/bool bugs

Change-Id: Id981c28d02ee22ad9a99f22a939887572d78e4b5

diff --git a/src/gromacs/domdec/domdec.cpp b/src/gromacs/domdec/domdec.cpp
index d72ccd4e9dee890ee15aee8dc629241375f232cc..2f4ed89c1305c5771bcb80389d2b4b9367ebe3fd 100644 (file)
--- a/src/gromacs/domdec/domdec.cpp
+++ b/src/gromacs/domdec/domdec.cpp
@@ -2452,7 +2452,7 @@ static float dd_vol_min(gmx_domdec_t *dd)
     return dd->comm->load[0].cvol_min*dd->nnodes;
 }
 
-static gmx_bool dd_load_flags(gmx_domdec_t *dd)
+static int dd_load_flags(gmx_domdec_t *dd)
 {
     return dd->comm->load[0].flags;
 }

diff --git a/src/gromacs/domdec/domdec_setup.cpp b/src/gromacs/domdec/domdec_setup.cpp
index 84f1b0534e5ba413f490f81e725105a9444d9fba..91d74d3d096022029cf885919c8773217bb2ba43 100644 (file)
--- a/src/gromacs/domdec/domdec_setup.cpp
+++ b/src/gromacs/domdec/domdec_setup.cpp
@@ -105,7 +105,7 @@ static void factorize(int               n,
 }
 
 /*! \brief Find largest divisor of \p n smaller than \p n*/
-static gmx_bool largest_divisor(int n)
+static int largest_divisor(int n)
 {
     std::vector<int> div;
     std::vector<int> mdiv;

diff --git a/src/gromacs/gmxana/gmx_bar.cpp b/src/gromacs/gmxana/gmx_bar.cpp
index 4f168c032d01e8c4dfa3072c21063825b191f231..71327f818829e2bc6cff14c302061ace95b689d4 100644 (file)
--- a/src/gromacs/gmxana/gmx_bar.cpp
+++ b/src/gromacs/gmxana/gmx_bar.cpp
@@ -495,7 +495,7 @@ static int lambda_vec_cmp_foreign(const lambda_vec_t *a,
     {
         return 0;
     }
-    return norm_a > norm_b;
+    return (norm_a > norm_b) ? 1 : -1;
 }
 
 /* Compare the sort order of two native lambda vectors