Packets: Fix VariantParser invalid parser access bug

[senf.git] / Scheduler / FdEvent.cci

diff --git a/Scheduler/FdEvent.cci b/Scheduler/FdEvent.cci
index 5391f71..9efe737 100644 (file)
--- a/Scheduler/FdEvent.cci
+++ b/Scheduler/FdEvent.cci
@@ -36,18 +36,13 @@
 // senf::scheduler::FdEvent
 
 prefix_ senf::scheduler::FdEvent::FdEvent(std::string const & name, Callback const & cb)
-    : FIFORunner::TaskInfo (name), cb_ (cb), fd_ (-1), pollable_ (true), events_ (0)
+    : detail::FIFORunner::TaskInfo (name), cb_ (cb), fd_ (-1), pollable_ (true), events_ (0)
 {}
 
 prefix_ senf::scheduler::FdEvent::~FdEvent()
 {
     if (detail::FdDispatcher::alive())
-       disable();
-}
-
-prefix_ bool senf::scheduler::FdEvent::enabled()
-{
-    return detail::FdSetBase::linked();
+        disable();
 }
 
 prefix_ senf::scheduler::FdEvent & senf::scheduler::FdEvent::action(Callback const & cb)
@@ -92,7 +87,7 @@ prefix_ void senf::scheduler::detail::FileDispatcher::timeout(int t)
 {
     managerTimeout_ = t;
     if (fds_.empty())
-        FdManager::instance().timeout(managerTimeout_);
+        detail::FdManager::instance().timeout(managerTimeout_);
 }
 
 prefix_ int senf::scheduler::detail::FileDispatcher::timeout()
@@ -109,7 +104,7 @@ prefix_ bool senf::scheduler::detail::FileDispatcher::empty()
 
 ///////////////////////////////////////////////////////////////////////////
 
-prefix_ int senf::scheduler::retrieve_filehandle(int fd)
+prefix_ int senf::scheduler::detail::retrieve_filehandle(int fd)
 {
     return fd;
 }