Rename BOOL to EBOOL

- All other ENUM_NAME functions start with E
- BOOL can easily collide with other names (e.g. on Windows)

Change-Id: I6cb9438386dfb0c93299dfc5a161e4294e7834a3

diff --git a/include/names.h b/include/names.h
index cd2d7da50bc83ce6bb58aa8d5dfd7d0cc70d7f10..671280ca5cc7cca91108b84399acf9ec7abf8328 100644 (file)
--- a/include/names.h
+++ b/include/names.h
@@ -96,7 +96,7 @@ extern const char *eAdressSITEtype_names[eAdressSITENR+1];
 #define        UNDEFINED               "UNDEFINED"
 #define ENUM_NAME(e,max,names) ((((e)<0)||((e)>=(max)))?UNDEFINED:(names)[e])
 
-#define BOOL(e)        ENUM_NAME(e,BOOL_NR,bool_names)
+#define EBOOL(e)       ENUM_NAME(e,BOOL_NR,bool_names)
 #define ENS(e)         ENUM_NAME(e,ensNR,ens_names)
 #define EI(e)          ENUM_NAME(e,eiNR,ei_names)
 #define EPBC(e)        ENUM_NAME(e,epbcNR,epbc_names)

diff --git a/src/gmxlib/pbc.c b/src/gmxlib/pbc.c
index 21655152c09a27e66c0d6e2c7738b262811b583f..e9cdd3fb9c135f8f4ea1bd38e0dbf42225bfbe01 100644 (file)
--- a/src/gmxlib/pbc.c
+++ b/src/gmxlib/pbc.c
@@ -99,7 +99,7 @@ void dump_pbc(FILE *fp,t_pbc *pbc)
     rvec_add(pbc->hbox_diag,pbc->mhbox_diag,sum_box);
     pr_rvecs(fp,0,"sum of the above two",&sum_box,1);
     fprintf(fp,"max_cutoff2 = %g\n",pbc->max_cutoff2);
-    fprintf(fp,"bLimitDistance = %s\n",BOOL(pbc->bLimitDistance));
+    fprintf(fp,"bLimitDistance = %s\n",EBOOL(pbc->bLimitDistance));
     fprintf(fp,"limit_distance2 = %g\n",pbc->limit_distance2);
     fprintf(fp,"ntric_vec = %d\n",pbc->ntric_vec);
     if (pbc->ntric_vec > 0) {

diff --git a/src/gmxlib/txtdump.c b/src/gmxlib/txtdump.c
index 87f104701f47f24bd10c17161c6b82de25d8fcfa..2e1381bcc79a4d2babff481cc8ff0d33d2221027 100644 (file)
--- a/src/gmxlib/txtdump.c
+++ b/src/gmxlib/txtdump.c
@@ -157,7 +157,7 @@ void pr_bvec(FILE *fp,int indent,const char *title,gmx_bool vec[],int n, gmx_boo
         {
           (void) pr_indent(fp,indent);
           (void) fprintf(fp,"%s[%d]=%s\n",title,bShowNumbers?i:-1,
-                        BOOL(vec[i]));
+                        EBOOL(vec[i]));
         }
     }
 }
@@ -514,7 +514,7 @@ static void pr_rotgrp(FILE *fp,int indent,int g,t_rotgrp *rotg)
   fprintf(fp,"rotation_group %d:\n",g);
   indent += 2;
   PS("type",EROTGEOM(rotg->eType));
-  PS("massw",BOOL(rotg->bMassW));
+  PS("massw",EBOOL(rotg->bMassW));
   pr_ivec_block(fp,indent,"atom",rotg->ind,rotg->nat,TRUE);
   pr_rvecs(fp,indent,"x_ref",rotg->x_ref,rotg->nat);
   pr_rvec(fp,indent,"vec",rotg->vec,DIM,TRUE);
@@ -575,11 +575,11 @@ void pr_inputrec(FILE *fp,int indent,const char *title,t_inputrec *ir,
     PR("ewald-rtol",ir->ewald_rtol);
     PR("ewald-geometry",ir->ewald_geometry);
     PR("epsilon-surface",ir->epsilon_surface);
-    PS("optimize-fft",BOOL(ir->bOptFFT));
+    PS("optimize-fft",EBOOL(ir->bOptFFT));
     PS("ePBC",EPBC(ir->ePBC));
-    PS("bPeriodicMols",BOOL(ir->bPeriodicMols));
-    PS("bContinuation",BOOL(ir->bContinuation));
-    PS("bShakeSOR",BOOL(ir->bShakeSOR));
+    PS("bPeriodicMols",EBOOL(ir->bPeriodicMols));
+    PS("bContinuation",EBOOL(ir->bContinuation));
+    PS("bShakeSOR",EBOOL(ir->bShakeSOR));
     PS("etc",ETCOUPLTYPE(ir->etc));
     PI("nsttcouple",ir->nsttcouple);
     PS("epc",EPCOUPLTYPE(ir->epc));
@@ -671,13 +671,13 @@ void pr_inputrec(FILE *fp,int indent,const char *title,t_inputrec *ir,
     if (ir->ePull != epullNO)
       pr_pull(fp,indent,ir->pull);
     
-    PS("rotation",BOOL(ir->bRot));
+    PS("rotation",EBOOL(ir->bRot));
     if (ir->bRot)
       pr_rot(fp,indent,ir->rot);
 
     PS("disre",EDISRETYPE(ir->eDisre));
     PS("disre-weighting",EDISREWEIGHTING(ir->eDisreWeighting));
-    PS("disre-mixed",BOOL(ir->bDisreMixed));
+    PS("disre-mixed",EBOOL(ir->bDisreMixed));
     PR("dr-fc",ir->dr_fc);
     PR("dr-tau",ir->dr_tau);
     PR("nstdisreout",ir->nstdisreout);
@@ -704,7 +704,7 @@ void pr_inputrec(FILE *fp,int indent,const char *title,t_inputrec *ir,
     PR("cos-accel",ir->cos_accel);
     pr_matrix(fp,indent,"deform",ir->deform,bMDPformat);
 
-    PS("adress",BOOL(ir->bAdress));
+    PS("adress",EBOOL(ir->bAdress));
     if (ir->bAdress){
         PS("adress_type",EADRESSTYPE(ir->adress->type));
         PR("adress_const_wf",ir->adress->const_wf);
@@ -713,7 +713,7 @@ void pr_inputrec(FILE *fp,int indent,const char *title,t_inputrec *ir,
         PS("adress_interface_correction",EADRESSICTYPE(ir->adress->icor));
         PS("adress_site",EADRESSSITETYPE(ir->adress->site));
         PR("adress_ex_force_cap",ir->adress->ex_forcecap);
-        PS("adress_do_hybridpairs", BOOL(ir->adress->do_hybridpairs));
+        PS("adress_do_hybridpairs", EBOOL(ir->adress->do_hybridpairs));
 
         pr_rvec(fp,indent,"adress_reference_coords",ir->adress->refs,DIM,TRUE);
     }
@@ -732,7 +732,7 @@ void pr_inputrec(FILE *fp,int indent,const char *title,t_inputrec *ir,
     pr_cosine(fp,indent,"efield-yt",&(ir->et[YY]),bMDPformat);
     pr_cosine(fp,indent,"efield-z",&(ir->ex[ZZ]),bMDPformat);
     pr_cosine(fp,indent,"efield-zt",&(ir->et[ZZ]),bMDPformat);
-    PS("bQMMM",BOOL(ir->bQMMM));
+    PS("bQMMM",EBOOL(ir->bQMMM));
     PI("QMconstraints",ir->QMconstraints);
     PI("QMMMscheme",ir->QMMMscheme);
     PR("scalefactor",ir->scalefactor);

diff --git a/src/kernel/ionize.c b/src/kernel/ionize.c
index 8f670ed88253600f585f075f53d6d4589e72dc01..41d44f1514214b2802538ce3b58ad608400adf13 100644 (file)
--- a/src/kernel/ionize.c
+++ b/src/kernel/ionize.c
@@ -712,7 +712,7 @@ void ionize(FILE *fp,const output_env_t oenv,t_mdatoms *md,gmx_mtop_t *mtop,
        }
        if (debug)
          fprintf(debug,"i = %d, nK = %d, nL = %d, bL = %s, bKHole = %s\n",
-                 i,nK,nL,BOOL(bL),BOOL(bKHole));
+                 i,nK,nL,EBOOL(bL),EBOOL(bKHole));
        if (E_lost < 0) {
          E_lost  = 0.0;
          bIonize = FALSE;

diff --git a/src/tools/gmx_sas.c b/src/tools/gmx_sas.c
index 2205bb20eb892766c85f2f4b3f9a5e750bf4667a..d486c36ed4d10bce950fd73483fe04aaca4ee63f 100644 (file)
--- a/src/tools/gmx_sas.c
+++ b/src/tools/gmx_sas.c
@@ -361,7 +361,7 @@ void sas_plot(int nfile,t_filenm fnm[],real solsize,int ndots,
              ii+1,*(atoms->resinfo[atoms->atom[ii].resind].name),
              *(atoms->atomname[ii]),
              atoms->atom[ii].q,radius[ii]-solsize,dgs_factor[i],
-             BOOL(bPhobic[i]));
+             EBOOL(bPhobic[i]));
   }
   fprintf(stderr,"%d out of %d atoms were classified as hydrophobic\n",
          nphobic,nx[1]);