fixes for ClockService::clock_type -> RestrictedInt change introduced by last commit

[senf.git] / senf / Scheduler / ClockService.cci

diff --git a/senf/Scheduler/ClockService.cci b/senf/Scheduler/ClockService.cci
index 6fd8bdd..e0a7b95 100644 (file)
--- a/senf/Scheduler/ClockService.cci
+++ b/senf/Scheduler/ClockService.cci
@@ -36,6 +36,12 @@
 #define prefix_ inline
 //-/////////////////////////////////////////////////////////////////////////////////////////////////
 
+#ifdef SENF_DEBUG
+#   define SENF_CLOCKTYPEVAL(clock) (clock).value()
+#else
+#   define SENF_CLOCKTYPEVAL(clock) (clock)
+#endif
+
 //-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ClockService
 
@@ -44,7 +50,7 @@ prefix_ senf::ClockService::clock_type senf::ClockService::now()
     struct timespec spec;
     if (clock_gettime(CLOCK_MONOTONIC, &spec) < 0)
         SENF_THROW_SYSTEM_EXCEPTION("clock_gettime()");
-    return spec.tv_sec * 1000000000LL + spec.tv_nsec;
+    return clock_type(spec.tv_sec * 1000000000LL + spec.tv_nsec);
 }
 
 //-/////////////////////////////////////////////////////////////////////////////////////////////////
@@ -54,7 +60,7 @@ namespace senf { namespace scheduler { ClockService::clock_type now(); } }
 
 prefix_ senf::ClockService::clock_type senf::ClockService::clock_m(abstime_type time)
 {
-    if (scheduler::now() - baseClock_ > 1000000000ll)
+    if (scheduler::now() - baseClock_ > clock_type(1000000000ll))
         restart_m();
     boost::posix_time::time_duration delta (time - baseAbstime_);
     return baseClock_ + clock_type( delta.ticks() )
@@ -65,12 +71,14 @@ prefix_ senf::ClockService::abstime_type senf::ClockService::abstime_m(clock_typ
 {
     if (clock == 0)
         return abstime_type();
-    if (scheduler::now() - baseClock_ > 1000000000ll)
+    if (scheduler::now() - baseClock_ > clock_type(1000000000ll))
         restart_m();
 #ifdef BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG
-    return baseAbstime_ + boost::posix_time::nanoseconds(clock-baseClock_);
+    return baseAbstime_ + boost::posix_time::nanoseconds(
+            SENF_CLOCKTYPEVAL( clock-baseClock_));
 #else
-    return baseAbstime_ + boost::posix_time::microseconds((clock-baseClock_+500)/1000);
+    return baseAbstime_ + boost::posix_time::microseconds(
+            SENF_CLOCKTYPEVAL( (clock-baseClock_+clock_type(500))/1000));
 #endif
 }
 
@@ -95,9 +103,11 @@ prefix_ senf::ClockService::abstime_type senf::ClockService::abstime(clock_type
 prefix_ senf::ClockService::reltime_type senf::ClockService::reltime(clock_type clock)
 {
 #ifdef BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG
-    return boost::posix_time::nanoseconds(clock);
+    return boost::posix_time::nanoseconds(
+            SENF_CLOCKTYPEVAL( clock));
 #else
-    return  boost::posix_time::microseconds((clock+500)/1000);
+    return  boost::posix_time::microseconds(
+            SENF_CLOCKTYPEVAL( (clock + clock_type(500))/1000));
 #endif
 }
 
@@ -113,7 +123,7 @@ prefix_ senf::ClockService::clock_type senf::ClockService::from_time_t(time_t co
 
 prefix_ senf::ClockService::clock_type senf::ClockService::nanoseconds(int64_type v)
 {
-    return v;
+    return clock_type(v);
 }
 
 prefix_ senf::ClockService::clock_type senf::ClockService::microseconds(int64_type v)
@@ -146,39 +156,39 @@ prefix_ senf::ClockService::clock_type senf::ClockService::days(int64_type v)
     return v * hours(24);
 }
 
-prefix_ senf::ClockService::clock_type senf::ClockService::in_nanoseconds(int64_type v)
+prefix_ senf::ClockService::int64_type senf::ClockService::in_nanoseconds(clock_type v)
 {
-    return v;
+    return SENF_CLOCKTYPEVAL( v);
 }
 
-prefix_ senf::ClockService::clock_type senf::ClockService::in_microseconds(int64_type v)
+prefix_ senf::ClockService::int64_type senf::ClockService::in_microseconds(clock_type v)
 {
-    return v / nanoseconds(1000);
+    return SENF_CLOCKTYPEVAL( v / nanoseconds(1000));
 }
 
-prefix_ senf::ClockService::clock_type senf::ClockService::in_milliseconds(int64_type v)
+prefix_ senf::ClockService::int64_type senf::ClockService::in_milliseconds(clock_type v)
 {
-    return v / microseconds(1000);
+    return SENF_CLOCKTYPEVAL( v / microseconds(1000));
 }
 
-prefix_ senf::ClockService::clock_type senf::ClockService::in_seconds(int64_type v)
+prefix_ senf::ClockService::int64_type senf::ClockService::in_seconds(clock_type v)
 {
-    return v / milliseconds(1000);
+    return SENF_CLOCKTYPEVAL( v / milliseconds(1000));
 }
 
-prefix_ senf::ClockService::clock_type senf::ClockService::in_minutes(int64_type v)
+prefix_ senf::ClockService::int64_type senf::ClockService::in_minutes(clock_type v)
 {
-    return v / seconds(60);
+    return SENF_CLOCKTYPEVAL( v / seconds(60));
 }
 
-prefix_ senf::ClockService::clock_type senf::ClockService::in_hours(int64_type v)
+prefix_ senf::ClockService::int64_type senf::ClockService::in_hours(clock_type v)
 {
-    return v / minutes(60);
+    return SENF_CLOCKTYPEVAL( v / minutes(60));
 }
 
-prefix_ senf::ClockService::clock_type senf::ClockService::in_days(int64_type v)
+prefix_ senf::ClockService::int64_type senf::ClockService::in_days(clock_type v)
 {
-    return v / hours(24);
+    return SENF_CLOCKTYPEVAL( v / hours(24));
 }
 
 prefix_ senf::ClockService::clock_type senf::ClockService::from_timeval(timeval const & time)
@@ -191,6 +201,8 @@ prefix_ void senf::ClockService::restart()
     instance().restart_m();
 }
 
+#undef SENF_CLOCKTYPEVAL
+
 //-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_