diff options
| author | allen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2002-04-28 18:55:09 +0000 |
|---|---|---|
| committer | allen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2002-04-28 18:55:09 +0000 |
| commit | 63ee81e2fc8881ca92b627380482010c0c9e34ad (patch) | |
| tree | fddf0c6eb3a5f9f4315e37c2b8b8a8e45c5b5036 /src | |
| parent | 4166988fbf583ac25e30e3080f35fb80899c6afc (diff) | |
Executive decision to change CCTK_FN_POINTER -> CCTK_FPOINTER and
CCTK_VARIABLE_FN_POINTER -> CCTK_VARIABLE_FPOINTER
Old definitions will be removed in next beta release
git-svn-id: http://svn.cactuscode.org/flesh/trunk@2769 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/cctk_Constants.h | 5 | ||||
| -rw-r--r-- | src/include/cctk_Types.h | 3 | ||||
| -rw-r--r-- | src/include/util_Table.h | 8 |
3 files changed, 11 insertions, 5 deletions
diff --git a/src/include/cctk_Constants.h b/src/include/cctk_Constants.h index 0932d70d..7e18c548 100644 --- a/src/include/cctk_Constants.h +++ b/src/include/cctk_Constants.h @@ -27,7 +27,10 @@ #define CCTK_VARIABLE_COMPLEX32 13 #define CCTK_VARIABLE_STRING 14 #define CCTK_VARIABLE_POINTER 15 -#define CCTK_VARIABLE_FN_POINTER 16 +#define CCTK_VARIABLE_FPOINTER 16 + +/* DEPRECATED IN BETA 12 */ +#define CCTK_VARIABLE_FN_POINTER 16 /* DEPRECATED IN BETA 10 */ #define CCTK_VARIABLE_CHAR 1 diff --git a/src/include/cctk_Types.h b/src/include/cctk_Types.h index e78d0982..52b937bf 100644 --- a/src/include/cctk_Types.h +++ b/src/include/cctk_Types.h @@ -22,6 +22,9 @@ #ifdef CCODE typedef void *CCTK_POINTER; +typedef void (*CCTK_FPOINTER)(void); + +/* DEPRECATED IN BETA 12 */ typedef void (*CCTK_FN_POINTER)(void); #define CCTK_STRING const char * diff --git a/src/include/util_Table.h b/src/include/util_Table.h index 03c5d02e..1db8ba35 100644 --- a/src/include/util_Table.h +++ b/src/include/util_Table.h @@ -165,7 +165,7 @@ int Util_TableGetGenericArray(int handle, /* pointers */ int Util_TableSetPointer(int handle, CCTK_POINTER value, const char *key); -int Util_TableSetFnPointer(int handle, CCTK_FN_POINTER value, const char *key); +int Util_TableSetFnPointer(int handle, CCTK_FPOINTER value, const char *key); /* a single character */ int Util_TableSetChar(int handle, CCTK_CHAR value, const char *key); @@ -213,7 +213,7 @@ int Util_TableSetPointerArray(int handle, int N_elements, const CCTK_POINTER array[], const char *key); int Util_TableSetFnPointerArray(int handle, - int N_elements, const CCTK_FN_POINTER array[], + int N_elements, const CCTK_FPOINTER array[], const char *key); /* arrays of characters (i.e. character strings with known length) */ @@ -290,7 +290,7 @@ int Util_TableSetComplex32Array(int handle, /* pointers */ int Util_TableGetPointer(int handle, CCTK_POINTER *value, const char *key); -int Util_TableGetFnPointer(int handle, CCTK_FN_POINTER *value, const char *key); +int Util_TableGetFnPointer(int handle, CCTK_FPOINTER *value, const char *key); /* a single character */ int Util_TableGetChar(int handle, CCTK_CHAR *value, const char *key); @@ -338,7 +338,7 @@ int Util_TableGetPointerArray(int handle, int N_elements, CCTK_POINTER array[], const char *key); int Util_TableGetFnPointerArray(int handle, - int N_elements, CCTK_FN_POINTER array[], + int N_elements, CCTK_FPOINTER array[], const char *key); /* arrays of characters (i.e. character strings of known length) */ |