X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FScheduler%2FClockService.cci;h=0c40875913621fa2fbddc92ab89d6f83e7b86661;hb=94e4eda4358a4def564175ae42173f91307e36a4;hp=c3a766f318f421e5f7daa8acc7e104fc4cb493a4;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Scheduler/ClockService.cci b/senf/Scheduler/ClockService.cci
index c3a766f..0c40875 100644
--- a/senf/Scheduler/ClockService.cci
+++ b/senf/Scheduler/ClockService.cci
@@ -26,12 +26,12 @@
 // Custom includes
 #include <time.h>
 #include <boost/date_time/posix_time/posix_time_types.hpp>
-#include "../Utils/Exception.hh"
+#include <senf/Utils/Exception.hh>
 
 #define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ClockService
 
 prefix_ senf::ClockService::clock_type senf::ClockService::now()
@@ -42,12 +42,14 @@ prefix_ senf::ClockService::clock_type senf::ClockService::now()
     return spec.tv_sec * 1000000000LL + spec.tv_nsec;
 }
 
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // 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()
@@ -184,7 +186,7 @@ prefix_ void senf::ClockService::restart()
     instance().restart_m();
 }
 
-///////////////////////////////cci.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_