diff options
| author | allen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2003-07-15 13:54:11 +0000 |
|---|---|---|
| committer | allen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2003-07-15 13:54:11 +0000 |
| commit | c90ccdfe5c7cc6c174d1cda2b7a6e9d487ff04b2 (patch) | |
| tree | 47c3b0456c40969fd6b6b412f45b20f11b2f2ed5 /src/include/cctk.h | |
| parent | 07e6e93bcfbb250786361485aa4ff47eb8b80fb6 (diff) | |
Minor fixes for Cactus/1117
git-svn-id: http://svn.cactuscode.org/flesh/trunk@3277 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'src/include/cctk.h')
| -rw-r--r-- | src/include/cctk.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/include/cctk.h b/src/include/cctk.h index e00d249a..f7642fb3 100644 --- a/src/include/cctk.h +++ b/src/include/cctk.h @@ -60,10 +60,6 @@ #define CCTK_CoordRegisterSystem(a,b,c) CCTKi_CoordRegisterSystem(a,b,CCTK_THORNSTRING,c) -#define CCTKi_EXPECTERR(in,err,warnonerr,message) CCTKi_ExpectError(in,err,warnonerr,__LINE__,__FORTRANFILE__,CCTK_THORNSTRING,message) - -#define CCTKi_EXPECTOK(in,ok,warnonerr,message) CCTKi_ExpectOK(in,ok,warnonerr,__LINE__,__FORTRANFILE__,CCTK_THORNSTRING,message) - #define CCTK_EQUALS(a,b) (CCTK_Equals(a,b).eq.1) #define CCTK_PASS_FTOF CCTK_FARGUMENTS @@ -260,7 +256,7 @@ inline int CCTK_GFINDEX4D (const cGH *GH, int i, int j, int k, int l) int *,\ cGH * -#define CCTK_EQUALS(a,b) (CCTK_Equals((a),(b))==1) +#define CCTK_EQUALS(a,b) (CCTK_Equals((a),(b))) #define CCTK_PASS_CTOC cctkGH @@ -275,10 +271,6 @@ inline int CCTK_GFINDEX4D (const cGH *GH, int i, int j, int k, int l) #define CCTK_MALLOC(s) CCTKi_Malloc(s,__LINE__,__FILE__) #define CCTK_FREE(p) CCTKi_Free(p) -#define CCTKi_EXPCTERR(in,err,warnonerr,message) CCTKi_ExpectError(in,err,warnonerr,__LINE__,__FORTRANFILE__,CCTK_THORNSTRING,message) - -#define CCTKi_EXPCTOK(in,ok,onerr,message) CCTKi_ExpectOK(in,ok,warnonerr,__LINE__,__FORTRANFILE__,CCTK_THORNSTRING,message) - #endif /*CCODE*/ #define CCTK_INFO(a) CCTK_Info(CCTK_THORNSTRING,(a)) |