Changed divide-by-zero #define from divide() to divide_err() to prevent namespace...

diff --git a/include/vec.h b/include/vec.h
index eaa56bf4cea4d1e9d82203b1b5a7e66619d902a2..79b024e44727ecdf54db93b8d4acc4a29b924051 100644 (file)
--- a/include/vec.h
+++ b/include/vec.h
@@ -845,7 +845,7 @@ static inline real trace(matrix m)
   return (m[XX][XX]+m[YY][YY]+m[ZZ][ZZ]);
 }
 
-static inline real _divide(real a,real b,const char *file,int line)
+static inline real _divide_err(real a,real b,const char *file,int line)
 {
     if (fabs(b) <= GMX_REAL_MIN) 
         gmx_fatal(FARGS,"Dividing by zero, file %s, line %d",file,line);
@@ -883,7 +883,7 @@ static void matrix_convert(matrix box, rvec vec, rvec angle)
                        -box[ZZ][XX]*box[ZZ][XX]-box[ZZ][YY]*box[ZZ][YY]);
 }
 
-#define divide(a,b) _divide((a),(b),__FILE__,__LINE__)
+#define divide_err(a,b) _divide_err((a),(b),__FILE__,__LINE__)
 #define mod(a,b)    _mod((a),(b),__FILE__,__LINE__)
 
 #ifdef __cplusplus

diff --git a/src/mdlib/ns.c b/src/mdlib/ns.c
index 1d4890ad667181fa8c5c4b8f74c7f78c5a20064d..7147502d070c4884e915c4eafb21985ec7319ce0 100644 (file)
--- a/src/mdlib/ns.c
+++ b/src/mdlib/ns.c
@@ -1555,7 +1555,7 @@ static int ns_simple_core(t_forcerec *fr,
     {
         for(m=0; (m<DIM); m++)
         {
-            b_inv[m] = divide(1.0,box_size[m]);
+            b_inv[m] = divide_err(1.0,box_size[m]);
         }
         bTriclinic = TRICLINIC(box);
     }