Redefine the default boolean type to gmx_bool.

[alexxy/gromacs.git] / src / gmxlib / index.c

diff --git a/src/gmxlib/index.c b/src/gmxlib/index.c
index 2f4d94fcfa49473b4f42134381fc293eb60922bf..4156d70405edbf6f9d30b6dedb597edab3cc0df8 100644 (file)
--- a/src/gmxlib/index.c
+++ b/src/gmxlib/index.c
@@ -69,7 +69,7 @@ struct gmx_residuetype
 };
 
 
-static bool gmx_ask_yesno(bool bASK)
+static gmx_bool gmx_ask_yesno(gmx_bool bASK)
 {
   char c;
 
@@ -130,7 +130,7 @@ void add_grp(t_blocka *b,char ***gnames,int nra,atom_id a[],const char *name)
 
 /* compare index in `a' with group in `b' at `index', 
    when `index'<0 it is relative to end of `b' */
-static bool grp_cmp(t_blocka *b, int nra, atom_id a[], int index)
+static gmx_bool grp_cmp(t_blocka *b, int nra, atom_id a[], int index)
 {
   int i;
   
@@ -148,7 +148,7 @@ static bool grp_cmp(t_blocka *b, int nra, atom_id a[], int index)
 }
 
 static void 
-p_status(const char **restype, int nres, const char **typenames, int ntypes, bool bVerb)
+p_status(const char **restype, int nres, const char **typenames, int ntypes, gmx_bool bVerb)
 {
     int i,j;
     int found;
@@ -186,7 +186,7 @@ p_status(const char **restype, int nres, const char **typenames, int ntypes, boo
 
 
 atom_id *
-mk_aid(t_atoms *atoms,const char ** restype,const char * typestring,int *nra,bool bMatch)
+mk_aid(t_atoms *atoms,const char ** restype,const char * typestring,int *nra,gmx_bool bMatch)
 /* Make an array of atom_ids for all atoms with residuetypes matching typestring, or the opposite if bMatch is false */
 {
     atom_id *a;
@@ -213,12 +213,12 @@ mk_aid(t_atoms *atoms,const char ** restype,const char * typestring,int *nra,boo
 
 typedef struct {
   char *rname;
-  bool bNeg;
+  gmx_bool bNeg;
   char *gname;
 } restp_t;
 
 static void analyse_other(const char ** restype,t_atoms *atoms,
-                         t_blocka *gb,char ***gn,bool bASK,bool bVerb)
+                         t_blocka *gb,char ***gn,gmx_bool bASK,gmx_bool bVerb)
 {
   restp_t *restp=NULL;
   char **attp=NULL;
@@ -308,7 +308,7 @@ static void analyse_other(const char ** restype,t_atoms *atoms,
 }
 
 static void analyse_prot(const char ** restype,t_atoms *atoms,
-                        t_blocka *gb,char ***gn,bool bASK,bool bVerb)
+                        t_blocka *gb,char ***gn,gmx_bool bASK,gmx_bool bVerb)
 {
   /* atomnames to be used in constructing index groups: */
   static const char *pnoh[]    = { "H" };
@@ -336,7 +336,7 @@ static void analyse_prot(const char ** restype,t_atoms *atoms,
   };
   /* construct index group containing (TRUE) or excluding (FALSE)
      given atom names */
-  const bool complement[NCH] = { 
+  const gmx_bool complement[NCH] = { 
     TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE, TRUE
   };
   const int  wholename[NCH]  = { -1, 0,-1,-1,-1,-1,-1,-1, 11,-1 };
@@ -353,7 +353,7 @@ static void analyse_prot(const char ** restype,t_atoms *atoms,
   int     n,j;
   atom_id *aid;
   int     nra,nnpres,npres;
-  bool    match;
+  gmx_bool    match;
   char    ndx_name[STRLEN],*atnm;
   int i;
 
@@ -608,10 +608,10 @@ gmx_residuetype_get_alltypes(gmx_residuetype_t    rt,
     
 
 
-bool 
+gmx_bool 
 gmx_residuetype_is_protein(gmx_residuetype_t rt, const char *resnm)
 {
-    bool rc;
+    gmx_bool rc;
     const char *p_type;
     
     if(gmx_residuetype_get_type(rt,resnm,&p_type)==0 &&
@@ -626,10 +626,10 @@ gmx_residuetype_is_protein(gmx_residuetype_t rt, const char *resnm)
     return rc;
 }
 
-bool 
+gmx_bool 
 gmx_residuetype_is_dna(gmx_residuetype_t rt, const char *resnm)
 {
-    bool rc;
+    gmx_bool rc;
     const char *p_type;
 
     if(gmx_residuetype_get_type(rt,resnm,&p_type)==0 &&
@@ -644,10 +644,10 @@ gmx_residuetype_is_dna(gmx_residuetype_t rt, const char *resnm)
     return rc;
 }
 
-bool 
+gmx_bool 
 gmx_residuetype_is_rna(gmx_residuetype_t rt, const char *resnm)
 {
-    bool rc;
+    gmx_bool rc;
     const char *p_type;
 
     if(gmx_residuetype_get_type(rt,resnm,&p_type)==0 &&
@@ -665,7 +665,7 @@ gmx_residuetype_is_rna(gmx_residuetype_t rt, const char *resnm)
 
 
 
-void analyse(t_atoms *atoms,t_blocka *gb,char ***gn,bool bASK,bool bVerb)
+void analyse(t_atoms *atoms,t_blocka *gb,char ***gn,gmx_bool bASK,gmx_bool bVerb)
 {
     gmx_residuetype_t rt;
     char    *resnm;
@@ -928,7 +928,7 @@ int find_group(char s[], int ngrps, char **grpname)
 {
   int aa, i, n;
   char string[STRLEN];
-  bool bMultiple;
+  gmx_bool bMultiple;
   
   bMultiple = FALSE;
   n = strlen(s);
@@ -975,7 +975,7 @@ static int qgroup(int *a, int ngrps, char **grpname)
 {
     char s[STRLEN];
     int  aa;
-    bool bInRange;
+    gmx_bool bInRange;
     char *end;
 
     do {