As discussed in today's Cactus call, applying a couple of the patches

from 14 Feb Patches list.

As discussed, will further investigate the validity and origin of the
Complex sqrt function later.


git-svn-id: http://svn.cactuscode.org/flesh/trunk@4262 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 6 insertions, 4 deletions

diff --git a/src/main/DefaultTimers.c b/src/main/DefaultTimers.c
index 2412c0a5..75537a26 100644
--- a/src/main/DefaultTimers.c
+++ b/src/main/DefaultTimers.c
@@ -369,8 +369,9 @@ static void CCTKi_TimerGetTimeOfDaySet(int timernum, void *idata, cTimerVal *val
   (void) (timernum + 0);
 
   data = (t_GetTimeOfDayTimer *) idata;
-  data->total.tv_sec  = vals[0].val.d;
-  data->total.tv_usec = 1000000*vals[0].val.d - data->total.tv_sec;
+  data->total.tv_sec  = (time_t)vals[0].val.d;
+  data->total.tv_usec = (suseconds_t)(1000000*vals[0].val.d)
+                                            - (suseconds_t)data->total.tv_sec;
 }
 
 
@@ -644,8 +645,9 @@ static void CCTKi_TimerGetrUsageSet(int timernum, void *idata, cTimerVal *vals)
   (void) (timernum + 0);
 
   data = (t_GetrUsageTimer *) idata;
-  data->total.tv_sec  = vals[0].val.d;
-  data->total.tv_usec = 1000000*vals[0].val.d - data->total.tv_sec;
+  data->total.tv_sec  = (time_t)vals[0].val.d;
+  data->total.tv_usec = (suseconds_t)(1000000*vals[0].val.d)
+                                            - (suseconds_t)data->total.tv_sec;
 }