X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FScheduler%2FClockService.cci;h=5fdf6687184b405e17422f92ae21924177984be9;hb=78a6e233083efa63a9cd0684a92abc64202a9ee7;hp=38f353ba38a5d1cc2752d6d6195775e1797e659d;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git

diff --git a/senf/Scheduler/ClockService.cci b/senf/Scheduler/ClockService.cci
index 38f353b..5fdf668 100644
--- a/senf/Scheduler/ClockService.cci
+++ b/senf/Scheduler/ClockService.cci
@@ -45,9 +45,11 @@ prefix_ senf::ClockService::clock_type senf::ClockService::now()
 ////////////////////////////////////////
 // private members
 
+namespace senf { namespace scheduler { ClockService::clock_type now(); } }
+
 prefix_ senf::ClockService::clock_type senf::ClockService::clock_m(abstime_type time)
 {
-    if (now() - baseClock_ > 1000000000ll)
+    if (scheduler::now() - baseClock_ > 1000000000ll)
         restart_m();
     boost::posix_time::time_duration delta (time - baseAbstime_);
     return baseClock_ + clock_type( delta.ticks() )
@@ -58,7 +60,7 @@ prefix_ senf::ClockService::abstime_type senf::ClockService::abstime_m(clock_typ
 {
     if (clock == 0)
         return abstime_type();
-    if (now() - baseClock_ > 1000000000ll)
+    if (scheduler::now() - baseClock_ > 1000000000ll)
         restart_m();
 #ifdef BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG
     return baseAbstime_ + boost::posix_time::nanoseconds(clock-baseClock_);
@@ -176,7 +178,7 @@ prefix_ senf::ClockService::clock_type senf::ClockService::in_days(int64_type v)
 
 prefix_ senf::ClockService::clock_type senf::ClockService::from_timeval(timeval const & time)
 {
-    return from_time_t(time.tv_sec) + ClockService::microseconds(time.tv_usec);
+    return from_time_t(time.tv_sec) + microseconds(time.tv_usec);
 }
 
 prefix_ void senf::ClockService::restart()