diff options
author | allen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-07-25 00:18:55 +0000 |
---|---|---|
committer | allen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-07-25 00:18:55 +0000 |
commit | 560f7a089e7a4796b8aef037e1f0abfa30dae376 (patch) | |
tree | f90e913939c607b28b3e89416b9b6cc2df7027c0 /src | |
parent | 0aaa0c279d5152b036eb1f1f5f7783650b0aabc4 (diff) |
More names changes
git-svn-id: http://svn.cactuscode.org/flesh/trunk@780 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'src')
-rw-r--r-- | src/IO/OverloadIO.c | 16 | ||||
-rw-r--r-- | src/comm/OverloadComm.c | 24 | ||||
-rw-r--r-- | src/include/Groups.h | 2 | ||||
-rw-r--r-- | src/include/Misc.h | 2 | ||||
-rw-r--r-- | src/include/OverloadMacros.h | 6 | ||||
-rw-r--r-- | src/main/Groups.c | 2 | ||||
-rw-r--r-- | src/main/OverloadMain.c | 24 | ||||
-rw-r--r-- | src/util/Misc.c | 4 |
8 files changed, 40 insertions, 40 deletions
diff --git a/src/IO/OverloadIO.c b/src/IO/OverloadIO.c index dac6dcaf..6ac8157c 100644 --- a/src/IO/OverloadIO.c +++ b/src/IO/OverloadIO.c @@ -22,13 +22,13 @@ static char *rcsid="$Header$"; #define OVERLOADABLE(name) OVERLOADABLE_DUMMYPROTOTYPE(name) /* There are default versions for all overloadable IO functions */ -#define CCTK_DummyOutputGH CactusDefaultOutputGH -#define CCTK_DummyOutputVarAsByMethod CactusDefaultOutputVarAsByMethod +#define CCTKi_DummyOutputGH CactusDefaultOutputGH +#define CCTKi_DummyOutputVarAsByMethod CactusDefaultOutputVarAsByMethod #include "IOOverloadables.h" -#undef CCTK_DummyOutputGH -#undef CCTK_DummyOutputVarAsByMethod +#undef CCTKi_DummyOutputGH +#undef CCTKi_DummyOutputVarAsByMethod #undef OVERLOADABLE /* Create the overloadable function variables and the @@ -60,14 +60,14 @@ int SetupIOFunctions(void) #define OVERLOADABLE(name) OVERLOADABLE_CHECK(name) /* There are default versions for all overloadable IO functions */ -#define CCTK_DummyOutputGH CactusDefaultOutputGH -#define CCTK_DummyOutputVarAsByMethod CactusDefaultOutputVarAsByMethod +#define CCTKi_DummyOutputGH CactusDefaultOutputGH +#define CCTKi_DummyOutputVarAsByMethod CactusDefaultOutputVarAsByMethod #include "IOOverloadables.h" /* Reset the #define to prevent complications. */ -#undef CCTK_DummyOutputGH -#undef CCTK_DummyOutputVarAsByMethod +#undef CCTKi_DummyOutputGH +#undef CCTKi_DummyOutputVarAsByMethod #undef OVERLOADABLE diff --git a/src/comm/OverloadComm.c b/src/comm/OverloadComm.c index cf4bed3b..8115c33a 100644 --- a/src/comm/OverloadComm.c +++ b/src/comm/OverloadComm.c @@ -22,16 +22,16 @@ static char *rcsid="$Header$"; #define OVERLOADABLE(name) OVERLOADABLE_DUMMYPROTOTYPE(name) /* Deal seperately with the SetupGH routine */ -#define CCTK_DummySetupGH CactusDefaultSetupGH -#define CCTK_DummyMyProc CactusDefaultMyProc -#define CCTK_DummynProcs CactusDefaultnProcs +#define CCTKi_DummySetupGH CactusDefaultSetupGH +#define CCTKi_DummyMyProc CactusDefaultMyProc +#define CCTKi_DummynProcs CactusDefaultnProcs #include "CommOverloadables.h" /* Reset the #define to prevent complications. */ -#undef CCTK_DummySetupGH -#undef CCTK_DummyMyProc -#undef CCTK_DummynProcs +#undef CCTKi_DummySetupGH +#undef CCTKi_DummyMyProc +#undef CCTKi_DummynProcs #undef OVERLOADABLE @@ -65,16 +65,16 @@ int SetupCommFunctions(void) #define OVERLOADABLE(name) OVERLOADABLE_CHECK(name) /* Deal seperately with the SetupGH routine */ -#define CCTK_DummySetupGH CactusDefaultSetupGH -#define CCTK_DummyMyProc CactusDefaultMyProc -#define CCTK_DummynProcs CactusDefaultnProcs +#define CCTKi_DummySetupGH CactusDefaultSetupGH +#define CCTKi_DummyMyProc CactusDefaultMyProc +#define CCTKi_DummynProcs CactusDefaultnProcs #include "CommOverloadables.h" /* Reset the #define to prevent complications. */ -#undef CCTK_DummySetupGH -#undef CCTK_DummyMyProc -#undef CCTK_DummynProcs +#undef CCTKi_DummySetupGH +#undef CCTKi_DummyMyProc +#undef CCTKi_DummynProcs #undef OVERLOADABLE diff --git a/src/include/Groups.h b/src/include/Groups.h index e379d4ff..b9c193b1 100644 --- a/src/include/Groups.h +++ b/src/include/Groups.h @@ -17,7 +17,7 @@ extern "C" { #endif -int CCTK_CreateGroup(const char *gname, const char *thorn, const char *imp, +int CCTKi_CreateGroup(const char *gname, const char *thorn, const char *imp, const char *gtype, const char *vtype, const char *gscope, diff --git a/src/include/Misc.h b/src/include/Misc.h index 127c815b..c02bf86b 100644 --- a/src/include/Misc.h +++ b/src/include/Misc.h @@ -15,7 +15,7 @@ extern "C" { #endif -int CCTK_SplitString(char **before, char **after, const char *string, const char *sep); +int Util_SplitString(char **before, char **after, const char *string, const char *sep); int CCTK_Equals(const char *string1, const char *string2); diff --git a/src/include/OverloadMacros.h b/src/include/OverloadMacros.h index 72c22583..53b96a9a 100644 --- a/src/include/OverloadMacros.h +++ b/src/include/OverloadMacros.h @@ -59,7 +59,7 @@ extern RETURN_TYPE (*CCTK_##name)(ARGUMENTS); /* This macro defines a dummy function */ #define OVERLOADABLE_DUMMY(name) \ -RETURN_TYPE CCTK_Dummy##name(ARGUMENTS) \ +RETURN_TYPE CCTKi_Dummy##name(ARGUMENTS) \ { \ fprintf(stderr, "Dummy %s called.\n", #name); \ return 0; \ @@ -67,13 +67,13 @@ RETURN_TYPE CCTK_Dummy##name(ARGUMENTS) \ /* This macro defines the prototype for a dummy function. */ #define OVERLOADABLE_DUMMYPROTOTYPE(name) \ -RETURN_TYPE CCTK_Dummy##name(ARGUMENTS); +RETURN_TYPE CCTKi_Dummy##name(ARGUMENTS); /* This macro defines a check line which will set the overloadable * function to be the dummy if it hasn't been set. */ #define OVERLOADABLE_CHECK(name) \ - if(!CCTK_##name) CCTK_##name = CCTK_Dummy##name; + if(!CCTK_##name) CCTK_##name = CCTKi_Dummy##name; /* This macro defines the prototype for the overloading function itself */ diff --git a/src/main/Groups.c b/src/main/Groups.c index 568ad714..5c48fe32 100644 --- a/src/main/Groups.c +++ b/src/main/Groups.c @@ -927,7 +927,7 @@ char *CCTK_VarName(int varnum) int CCTK_DecomposeName(const char *fullname, char **implementation, char **name) { - return CCTK_SplitString(implementation, name, fullname, "::"); + return Util_SplitString(implementation, name, fullname, "::"); } diff --git a/src/main/OverloadMain.c b/src/main/OverloadMain.c index b65ad9ad..1e3758f0 100644 --- a/src/main/OverloadMain.c +++ b/src/main/OverloadMain.c @@ -21,16 +21,16 @@ static char *rcsid="$Header$"; #define OVERLOADABLE(name) OVERLOADABLE_DUMMYPROTOTYPE(name) /* These ones actually have defaults. */ -#define CCTK_DummyInitialise CactusDefaultInitialise -#define CCTK_DummyEvolve CactusDefaultEvolve -#define CCTK_DummyShutdown CactusDefaultShutdown +#define CCTKi_DummyInitialise CactusDefaultInitialise +#define CCTKi_DummyEvolve CactusDefaultEvolve +#define CCTKi_DummyShutdown CactusDefaultShutdown #include "MainOverloadables.h" /* Reset the #define to prevent complications. */ -#undef CCTK_DummyInitialise -#undef CCTK_DummyEvolve -#undef CCTK_DummyShutdown +#undef CCTKi_DummyInitialise +#undef CCTKi_DummyEvolve +#undef CCTKi_DummyShutdown #undef OVERLOADABLE @@ -64,16 +64,16 @@ int SetupMainFunctions(void) #define OVERLOADABLE(name) OVERLOADABLE_CHECK(name) /* These ones actually have defaults. */ -#define CCTK_DummyInitialise CactusDefaultInitialise -#define CCTK_DummyEvolve CactusDefaultEvolve -#define CCTK_DummyShutdown CactusDefaultShutdown +#define CCTKi_DummyInitialise CactusDefaultInitialise +#define CCTKi_DummyEvolve CactusDefaultEvolve +#define CCTKi_DummyShutdown CactusDefaultShutdown #include "MainOverloadables.h" /* Reset the #define to prevent complications. */ -#undef CCTK_DummyInitialise -#undef CCTK_DummyEvolve -#undef CCTK_DummyShutdown +#undef CCTKi_DummyInitialise +#undef CCTKi_DummyEvolve +#undef CCTKi_DummyShutdown #undef OVERLOADABLE diff --git a/src/util/Misc.c b/src/util/Misc.c index 49915fda..e2f47c5c 100644 --- a/src/util/Misc.c +++ b/src/util/Misc.c @@ -26,7 +26,7 @@ #include "WarnLevel.h" /*@@ - @routine CCTK_SplitString + @routine Util_SplitString @date Wed Jan 20 10:14:00 1999 @author Tom Goodale @desc @@ -41,7 +41,7 @@ @endhistory @@*/ -int CCTK_SplitString(char **before, char **after, const char *string, const char *sep) +int Util_SplitString(char **before, char **after, const char *string, const char *sep) { int retval; char *position; |