Redefine the default boolean type to gmx_bool.

[alexxy/gromacs.git] / src / gmxlib / selection / selmethod.c

diff --git a/src/gmxlib/selection/selmethod.c b/src/gmxlib/selection/selmethod.c
index fbbe90a42dac011d421d7b8dde6d863f6bf7e60f..982eaed6efe2cc8a7ba03ecab341f9b4867a83c1 100644 (file)
--- a/src/gmxlib/selection/selmethod.c
+++ b/src/gmxlib/selection/selmethod.c
@@ -201,7 +201,7 @@ report_param_error(FILE *fp, const char *mname, const char *pname,
  * \param[in]     name    Name of the method (used for error messages).
  * \param[in]     nparams Number of parameters in \p param.
  * \param[in,out] param   Parameter array
- *   (only the \c flags field of boolean parameters may be modified).
+ *   (only the \c flags field of gmx_boolean parameters may be modified).
  * \param[in]     symtab  Symbol table (used for checking overlaps).
  * \returns       TRUE if there are no problems with the parameters,
  *   FALSE otherwise.
@@ -214,11 +214,11 @@ report_param_error(FILE *fp, const char *mname, const char *pname,
  * If you remove a check, make sure that the parameter parser can handle the
  * resulting parameters.
  */
-static bool
+static gmx_bool
 check_params(FILE *fp, const char *name, int nparams, gmx_ana_selparam_t param[],
              gmx_sel_symtab_t *symtab)
 {
-    bool              bOk = TRUE;
+    gmx_bool              bOk = TRUE;
     gmx_sel_symrec_t *sym;
     int               i, j;
 
@@ -308,21 +308,21 @@ check_params(FILE *fp, const char *name, int nparams, gmx_ana_selparam_t param[]
                 bOk = FALSE;
             }
         }
-        /* Check boolean parameters */
+        /* Check gmx_boolean parameters */
         if (param[i].val.type == NO_VALUE)
         {
             if (param[i].val.nr != 0)
             {
-                report_param_error(fp, name, param[i].name, "error: number of values should be zero for boolean parameters");
+                report_param_error(fp, name, param[i].name, "error: number of values should be zero for gmx_boolean parameters");
                 bOk = FALSE;
             }
-            /* The boolean parameters should always be optional, so set the
+            /* The gmx_boolean parameters should always be optional, so set the
              * flag for convenience. */
             param[i].flags |= SPAR_OPTIONAL;
             /* Any other flags should not be specified */
             if (param[i].flags & ~SPAR_OPTIONAL)
             {
-                report_param_error(fp, name, param[i].name, "error: boolean parameter should not have any flags set");
+                report_param_error(fp, name, param[i].name, "error: gmx_boolean parameter should not have any flags set");
                 bOk = FALSE;
             }
         }
@@ -413,11 +413,11 @@ check_params(FILE *fp, const char *name, int nparams, gmx_ana_selparam_t param[]
  * This function checks that all the required callbacks are defined, i.e.,
  * not NULL, to find programming errors.
  */
-static bool
+static gmx_bool
 check_callbacks(FILE *fp, gmx_ana_selmethod_t *method)
 {
-    bool         bOk = TRUE;
-    bool         bNeedInit;
+    gmx_bool         bOk = TRUE;
+    gmx_bool         bNeedInit;
     int          i;
 
     /* Make some checks on init_data and free */
@@ -484,10 +484,10 @@ check_callbacks(FILE *fp, gmx_ana_selmethod_t *method)
  * If you remove a check, please make sure that the selection parser,
  * compiler, and evaluation functions can deal with the method.
  */
-static bool
+static gmx_bool
 check_method(FILE *fp, gmx_ana_selmethod_t *method, gmx_sel_symtab_t *symtab)
 {
-    bool         bOk = TRUE;
+    gmx_bool         bOk = TRUE;
 
     /* Check the type */
     if (method->type == NO_VALUE)
@@ -554,10 +554,10 @@ check_method(FILE *fp, gmx_ana_selmethod_t *method, gmx_sel_symtab_t *symtab)
  * If you remove a check, please make sure that the selection parser,
  * compiler, and evaluation functions can deal with the method.
  */
-static bool
+static gmx_bool
 check_modifier(FILE *fp, gmx_ana_selmethod_t *method, gmx_sel_symtab_t *symtab)
 {
-    bool         bOk = TRUE;
+    gmx_bool         bOk = TRUE;
 
     /* Check the type */
     if (method->type != NO_VALUE && method->type != POS_VALUE)
@@ -617,7 +617,7 @@ int
 gmx_ana_selmethod_register(struct gmx_ana_selcollection_t *sc,
                            const char *name, gmx_ana_selmethod_t *method)
 {
-    bool bOk;
+    gmx_bool bOk;
 
     /* Check the method */
     if (method->flags & SMETH_MODIFIER)
@@ -654,7 +654,7 @@ gmx_ana_selmethod_register_defaults(struct gmx_ana_selcollection_t *sc)
 {
     size_t i;
     int  rc;
-    bool bOk;
+    gmx_bool bOk;
 
     bOk = TRUE;
     for (i = 0; i < asize(smtable_def); ++i)