Merge "Resolved gerrit issue https://gerrit.gromacs.org/#change,126" into release...

diff --git a/include/gmx_ana.h b/include/gmx_ana.h
index b1eeaf555046bfd6d5c7598235787131c08d9734..ecd659bd8fc47aaba3610da65acd00f7192c8d58 100644 (file)
--- a/include/gmx_ana.h
+++ b/include/gmx_ana.h
@@ -78,6 +78,9 @@ gmx_density(int argc,char *argv[]);
 int 
 gmx_densmap(int argc,char *argv[]);
 
+int 
+gmx_densorder(int argc,char *argv[]);
+
 int 
 gmx_dielectric(int argc,char *argv[]);
 
@@ -144,6 +147,9 @@ gmx_helix(int argc,char *argv[]);
 int
 gmx_helixorient(int argc,char *argv[]);
 
+int
+gmx_hydorder(int argc,char *argv[]);
+
 int 
 gmx_kinetics(int argc,char *argv[]);
 

diff --git a/src/tools/binsearch.c b/src/tools/binsearch.c
index 1cded0cff9d615432983add329bd4e09d0228d3c..d52074b537b86b083d07e662288fae8dd02d1156 100644 (file)
--- a/src/tools/binsearch.c
+++ b/src/tools/binsearch.c
@@ -165,7 +165,8 @@ int LinearSearch (double *array,int startindx, int stopindx,
     }
 
     else 
-        fprintf(stderr,"Error: startindex=stopindex=%d\n",startindx);
-
+        gmx_fatal(FARGS,"Startindex=stopindex=%d\n",startindx);
+        
+    return -1;
 }