diff options
| author | schnetter <schnetter@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2004-12-28 18:55:00 +0000 |
|---|---|---|
| committer | schnetter <schnetter@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2004-12-28 18:55:00 +0000 |
| commit | fe4ba087da02fb06b41e936626521f0fd77434e3 (patch) | |
| tree | e0829b3f03596b79e7f80f827ed0da20468da299 /src/util/CactusTimers.c | |
| parent | b26a4e235d92a4c2d91fb26db10f5034e7a88bb8 (diff) | |
Rename "round" to "myround". Otherwise, the function "round" has the
same name as the one from <math.h> (which is #included) but has a
different return type, which is an error for gcc 4.0.
git-svn-id: http://svn.cactuscode.org/flesh/trunk@3944 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'src/util/CactusTimers.c')
| -rw-r--r-- | src/util/CactusTimers.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/src/util/CactusTimers.c b/src/util/CactusTimers.c index 7c630dac..6ad254d3 100644 --- a/src/util/CactusTimers.c +++ b/src/util/CactusTimers.c @@ -405,12 +405,13 @@ static int CCTKi_TimerCreate (const char *timername) { int retval; t_Timer *timer; + void *tmp; const cClockFuncs *funcs; int this_timer; int handle; - if (Util_GetHandle (timers, timername, (void **) &timer) >= 0) + if (Util_GetHandle (timers, timername, &tmp) >= 0) { /* Handle already exists */ retval = -1; @@ -476,11 +477,13 @@ static int CCTKi_TimerCreate (const char *timername) @@*/ int CCTK_TimerDestroy (const char *timername) { + void *tmp; t_Timer *timer; int this_timer; - this_timer = Util_GetHandle (timers, timername, (void **) &timer); + this_timer = Util_GetHandle (timers, timername, &tmp); + timer = tmp; if (this_timer >= 0) { CCTKi_TimerDestroy (this_timer, timer); @@ -612,11 +615,13 @@ static void CCTKi_TimerDestroy (int this_timer, t_Timer *timer) @@*/ int CCTK_TimerStart (const char *timername) { + void *tmp; t_Timer *timer; int this_timer; - this_timer = Util_GetHandle (timers, timername, (void **) &timer); + this_timer = Util_GetHandle (timers, timername, &tmp); + timer = tmp; if (this_timer >= 0) { CCTKi_TimerStart (this_timer, timer); @@ -744,11 +749,13 @@ static void CCTKi_TimerStart (int this_timer, t_Timer *timer) @@*/ int CCTK_TimerStop (const char *timername) { + void *tmp; t_Timer *timer; int this_timer; - this_timer = Util_GetHandle (timers, timername, (void **)&timer); + this_timer = Util_GetHandle (timers, timername, &tmp); + timer = tmp; if (this_timer >= 0) { CCTKi_TimerStop (this_timer, timer); @@ -875,11 +882,13 @@ static void CCTKi_TimerStop (int this_timer, t_Timer *timer) @@*/ int CCTK_TimerReset (const char *timername) { + void *tmp; t_Timer *timer; int this_timer; - this_timer = Util_GetHandle (timers, timername, (void **) &timer); + this_timer = Util_GetHandle (timers, timername, &tmp); + timer = tmp; if (this_timer >= 0) { CCTKi_TimerReset (this_timer, timer); @@ -1012,11 +1021,13 @@ static void CCTKi_TimerReset (int this_timer, t_Timer *timer) @@*/ int CCTK_Timer (const char *timername, cTimerData *info) { + void *tmp; t_Timer *timer; int this_timer; - this_timer = Util_GetHandle (timers, timername, (void **) &timer); + this_timer = Util_GetHandle (timers, timername, &tmp); + timer = tmp; if (this_timer >= 0) { CCTKi_Timer (this_timer, timer, info); |