Packets: Fix VariantParser invalid parser access bug

[senf.git] / Scheduler / SignalEvent.ih

diff --git a/Scheduler/SignalEvent.ih b/Scheduler/SignalEvent.ih
index 7e96134..23ef3e7 100644 (file)
--- a/Scheduler/SignalEvent.ih
+++ b/Scheduler/SignalEvent.ih
@@ -23,8 +23,8 @@
 /** \file
     \brief SignalDispatcher internal header */
 
-#ifndef IH_SignalDispatcher_
-#define IH_SignalDispatcher_ 1
+#ifndef IH_SENF_Scheduler_SignalEvent_
+#define IH_SENF_Scheduler_SignalEvent_ 1
 
 // Custom includes
 #include "FdManager.hh"
@@ -35,10 +35,10 @@
 ///////////////////////////////ih.p////////////////////////////////////////
 
 namespace senf {
-    
-    class Scheduler;
-
 namespace scheduler {
+
+    void restart();
+
 namespace detail {
 
     struct SignalSetCompare {
@@ -54,7 +54,7 @@ namespace detail {
     };
 
     class SignalDispatcher
-        : public FdManager::Event,
+        : public detail::FdManager::Event,
           public singleton<SignalDispatcher>
     {
         typedef boost::intrusive::iset< SignalSetBase::value_traits<SignalEvent>,
@@ -92,9 +92,9 @@ namespace detail {
         bool blocked_;
         sigset_t sigSet_;
 
+        friend void senf::scheduler::restart();
         friend class senf::scheduler::SignalEvent;
         friend class singleton<SignalDispatcher>;
-        friend class senf::Scheduler;
     };
 
 }}}