diff options
| author | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2000-02-17 09:04:21 +0000 |
|---|---|---|
| committer | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2000-02-17 09:04:21 +0000 |
| commit | 7a27a6c53054bc16d121a2398d1c1c5aeca4dcfd (patch) | |
| tree | 16ea001bd39b5c0858261ede4005249e01cb8b2d /src/include/cctk.h | |
| parent | 4f96374c0fa1afb1539da18d8c284459a5ab902e (diff) | |
Some extra protection in some macros as noticed by Erik.
Tom
git-svn-id: http://svn.cactuscode.org/flesh/trunk@1389 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'src/include/cctk.h')
| -rw-r--r-- | src/include/cctk.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/include/cctk.h b/src/include/cctk.h index 12476fff..e0ac44a6 100644 --- a/src/include/cctk.h +++ b/src/include/cctk.h @@ -61,7 +61,7 @@ #define CCTK_PASS_FTOF CCTK_FARGUMENTS -#define CCTK_DELTA_SPACE(x) cctk_delta_space(x)/cctk_levfac(x) +#define CCTK_DELTA_SPACE(x) (cctk_delta_space(x)/cctk_levfac(x)) #define CCTK_DELTA_TIME cctk_delta_time #define CCTK_LSSH(stag,dim) cctk_lssh(stag*CCTK_NSTAGGER+dim) #define CCTK_LSSH_IDX(stag,dim) (stag*CCTK_NSTAGGER+dim) @@ -96,8 +96,8 @@ #include "cctk_Reduction.h" #include "cctk_WarnLevel.h" -#define CCTK_GFINDEX3D(GH,i,j,k) ((i) + GH->cctk_lsh[0]*((j)+GH->cctk_lsh[1]*(k))) -#define CCTK_GFINDEX2D(GH,i,j) ((i) + GH->cctk_lsh[0]*((j))) +#define CCTK_GFINDEX3D(GH,i,j,k) ((i) + (GH)->cctk_lsh[0]*((j)+(GH)->cctk_lsh[1]*(k))) +#define CCTK_GFINDEX2D(GH,i,j) ((i) + (GH)->cctk_lsh[0]*((j))) #define CCTK_GFINDEX1D(GH,i) (i) @@ -186,11 +186,11 @@ extern int _cctk_one; -#define CCTK_EQUALS(a,b) (CCTK_Equals(a,b)==1) +#define CCTK_EQUALS(a,b) (CCTK_Equals((a),(b))==1) #define CCTK_PASS_CTOC cctkGH -#define CCTK_DELTA_SPACE(x) cctk_delta_space[x]/cctk_levfac[x] +#define CCTK_DELTA_SPACE(x) (cctk_delta_space[x]/cctk_levfac[x]) #define CCTK_DELTA_TIME cctk_delta_time #define CCTK_LSSH(stag,dim) cctk_lssh[stag*CCTK_NSTAGGER+dim] #define CCTK_LSSH_IDX(stag,dim) (stag*CCTK_NSTAGGER+dim) @@ -203,8 +203,8 @@ extern int _cctk_one; #endif /*CCODE*/ -#define CCTK_INFO(a) CCTK_Info(CCTK_THORNSTRING,a) -#define CCTK_PARAMWARN(a) CCTK_ParamWarn(CCTK_THORNSTRING,a) +#define CCTK_INFO(a) CCTK_Info(CCTK_THORNSTRING,(a)) +#define CCTK_PARAMWARN(a) CCTK_ParamWarn(CCTK_THORNSTRING,(a)) /* #define CCTK_MAKESTRING(x) CCTK_REALSTRING(x) |