diff options
| author | allen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-07-03 14:54:27 +0000 |
|---|---|---|
| committer | allen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-07-03 14:54:27 +0000 |
| commit | 7b721aeb46e4774c478b12844c85f2f85c7e371f (patch) | |
| tree | fe155b7e286be172ea83596f457c6788972e757e /src/include/cctk.h | |
| parent | 393215a1f63d91cf68f9d5e70b7f16b9d90f5780 (diff) | |
Changed CCTK_Warns t CCTK_WARN so that I can try and pass thorught the
line number and file name to the Warn message. This hass problems:
1) I really need to include cctk.h then (for some reason) in WarnLevel.h,
but then I guess the Fortran name for CCTK_Warn is CCTK_WARN so it
doesn't much care for me having a macro for CCTK_WARN.
2) Now I need three fortran strings to be passed into C. This works at
the moment on Linux, but not on other machines, so you may need to
run with warnings off for a little while.
3) Fortran doesn't get the file name, because (?) it is actually
something from a pipe which gets preprocessed and not the file.
I have no idea how to fix this.
I may just scrap all this, but I want to persevere a bit
Oh, there is a new parameter cctk_full_warnings (default yes for now)
which gives the old style warnings with no.
git-svn-id: http://svn.cactuscode.org/flesh/trunk@618 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'src/include/cctk.h')
| -rw-r--r-- | src/include/cctk.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/include/cctk.h b/src/include/cctk.h index ea19ce8c..a9687a22 100644 --- a/src/include/cctk.h +++ b/src/include/cctk.h @@ -47,6 +47,9 @@ INTEGER cctk_iteration&&\ CCTK_POINTER cctkGH&&\ +#define CCTK_WARN(a,b) CCTK_Warn(a,__LINE__,"unknown file",CCTK_THORNSTRING,b) + + #endif /*FCODE*/ #ifdef CCODE @@ -107,18 +110,20 @@ extern int _cctk_one; +#define CCTK_WARN(a,b) CCTK_Warn(a,__LINE__,__FILE__,CCTK_THORNSTRING,b) + + #endif /*CCODE*/ #define CCTK_VARIABLE_CHAR 1 -#define CCTK_VARIABLE_INTEGER 2 +#define CCTK_VARIABLE_INT 2 #define CCTK_VARIABLE_REAL 3 #define CCTK_VARIABLE_COMPLEX 4 /*#define CCTK_MAKESTRING(x) CCTK_REALSTRING(x) #define CCTK_REALSTRING(x) #x -#define CCTK_WARN(a,b) CCTK_Warn(a,CCTK_MAKESTRING(CCTK_THORN),b) +#define CCTK_WARN(a,b) CCTK_Warn(a,CCTK_MAKESTRING(CCTK_THORN),b,__LINE__,__FILE__) */ -#define CCTK_WARN(a,b) CCTK_Warn(a,CCTK_THORNSTRING,b) #define CCTK_INFO(a) CCTK_Info(CCTK_THORNSTRING,a) #define CCTK_PARAMWARN(a) CCTK_ParamWarn(CCTK_THORNSTRING,a) |