X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FTimerEvent.ih;h=5cda3c0c1db309113bacb5bd6930ea2a0f0890f6;hb=04b5fd6be72efd504de15a215a268f8b82f4d132;hp=8bae8d17ab106b7e91c647d0cdfc6795057f5546;hpb=db007c39287e3c666dd6b53edc8c3404617c7dd5;p=senf.git

diff --git a/Scheduler/TimerEvent.ih b/Scheduler/TimerEvent.ih
index 8bae8d1..5cda3c0 100644
--- a/Scheduler/TimerEvent.ih
+++ b/Scheduler/TimerEvent.ih
@@ -32,10 +32,10 @@
 ///////////////////////////////ih.p////////////////////////////////////////
 
 namespace senf {
+namespace scheduler {
 
-    class Scheduler;
+    void restart();
 
-namespace scheduler {
 namespace detail {
 
     struct TimerSetCompare {
@@ -44,15 +44,11 @@ namespace detail {
     };
 
     class TimerDispatcher
-        : public FdManager::Event,
+        : public detail::FdManager::Event,
           public singleton<TimerDispatcher>
     {
         SENF_LOG_CLASS_AREA();
         
-        typedef boost::intrusive::imultiset< TimerSetBase::value_traits<TimerEvent>,
-                                             TimerSetCompare,
-                                             false > TimerSet;
-
     public:
         using singleton<TimerDispatcher>::instance;
         using singleton<TimerDispatcher>::alive;
@@ -75,6 +71,10 @@ namespace detail {
         static void sigHandler(int signal, ::siginfo_t * siginfo, void *);
         void reschedule();
 
+        typedef boost::intrusive::imultiset< TimerSetBase::value_traits<TimerEvent>,
+                                             TimerSetCompare,
+                                             false > TimerSet;
+
         TimerSet timers_;
 
         int timerPipe_[2];
@@ -82,7 +82,7 @@ namespace detail {
         bool blocked_;
         timer_t timerId_;
 
-        friend class senf::Scheduler;
+        friend void senf::scheduler::restart();
         friend class singleton<TimerDispatcher>;
     };