summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorgoodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac>1999-06-24 11:59:50 +0000
committergoodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac>1999-06-24 11:59:50 +0000
commit39057fd4fd78e7c8a101581ebf1e673d47f4a30e (patch)
treee0cc0e3c2ae14793849078622f0dcfffc94ff956 /src
parentfc9c3eadbc0389ccdf75287970de832db16de9ae (diff)
Various chnages suggested by compilation warnings etc.
Tom git-svn-id: http://svn.cactuscode.org/flesh/trunk@571 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'src')
-rw-r--r--src/comm/Reduction.c4
-rw-r--r--src/main/CactusDefaultEvolve.c2
-rw-r--r--src/main/CactusDefaultInitialise.c2
-rw-r--r--src/main/ProcessCommandLine.c2
4 files changed, 6 insertions, 4 deletions
diff --git a/src/comm/Reduction.c b/src/comm/Reduction.c
index bf2ab770..2c0ee283 100644
--- a/src/comm/Reduction.c
+++ b/src/comm/Reduction.c
@@ -22,6 +22,8 @@
#include "StoreHandledData.h"
#include "Reduction.h"
+static char *rcsid = "$Header$";
+
static cHandledData *ReductionOperators = NULL;
static int num_reductions = 0;
@@ -66,7 +68,7 @@ int CCTK_RegisterReductionOperator(void (*function)(REGISTER_ARGLIST),
if(handle < 0)
{
/* Get a handle for it. */
- handle = CCTK_NewHandle(&ReductionOperators, name, function);
+ handle = CCTK_NewHandle(&ReductionOperators, name, (void *)function);
/* Remember how many reduction operators there are */
num_reductions++;
diff --git a/src/main/CactusDefaultEvolve.c b/src/main/CactusDefaultEvolve.c
index 7bcebf33..c4486a70 100644
--- a/src/main/CactusDefaultEvolve.c
+++ b/src/main/CactusDefaultEvolve.c
@@ -7,7 +7,7 @@
@enddesc
@@*/
-#define DEBUG_CCTK
+/*#define DEBUG_CCTK*/
#include <stdio.h>
diff --git a/src/main/CactusDefaultInitialise.c b/src/main/CactusDefaultInitialise.c
index 3983511d..57bcb6ea 100644
--- a/src/main/CactusDefaultInitialise.c
+++ b/src/main/CactusDefaultInitialise.c
@@ -105,7 +105,7 @@ int CactusInitialiseGH(cGH *GH)
CCTK_PRINTSEPARATOR
printf("In Cactus_Initialise\n--------------------\n");
printf(" Initializing GH->time = %f\n",GH->time);
- printf(" Initializing GH->iteration = %lu\n",GH->iteration);
+ printf(" Initializing GH->iteration = %u\n",GH->iteration);
CCTK_PRINTSEPARATOR
#endif
diff --git a/src/main/ProcessCommandLine.c b/src/main/ProcessCommandLine.c
index 3f0d1b7b..92341929 100644
--- a/src/main/ProcessCommandLine.c
+++ b/src/main/ProcessCommandLine.c
@@ -12,7 +12,7 @@
#include "flesh.h"
#include "getopt.h"
-static char *rcsid = "$Header";
+static char *rcsid = "$Header$";
static int argc;