X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FIOEvent.cc;h=7517e41b3a813667eb642976bb5839e810f91954;hb=bd9f9d3fd6fbcff0112a7bf48ab9284da9576b11;hp=73bcc5f68417997782929cd4f43b4ddabfedbf41;hpb=40fa3e3f1e0f639c68bd15bf469e35045f94abee;p=senf.git

diff --git a/PPI/IOEvent.cc b/PPI/IOEvent.cc
index 73bcc5f..7517e41 100644
--- a/PPI/IOEvent.cc
+++ b/PPI/IOEvent.cc
@@ -28,7 +28,6 @@
 
 // Custom includes
 #include "../Utils/senfassert.hh"
-#include <boost/bind.hpp>
 
 //#include "IOEvent.mpp"
 #define prefix_
@@ -42,25 +41,25 @@
 
 prefix_ void senf::ppi::IOEvent::v_enable()
 {
-    Scheduler::instance().add(fd_, boost::bind(&IOEvent::cb,this,_1),
-                              Scheduler::EventId(events_));
+    if (fd_ != -1)
+        event_.enable();
 }
 
 prefix_ void senf::ppi::IOEvent::v_disable()
 {
-    Scheduler::instance().remove(fd_, Scheduler::EventId(events_));
+    if (fd_ != -1)
+        event_.disable();
 }
 
 prefix_ void senf::ppi::IOEvent::cb(int event)
 {
-    if ((event & ~events_) != 0) {
+    if ((event & ~event_.events()) != 0) {
         if (event & Err)
             throw ErrorException();
         else if (event & Hup)
             throw HangupException();
         else
-            // This cannot happen.
-            SENF_ASSERT(false);
+            SENF_ASSERT(false && "Internal failure in senf::ppi::IOEvent::cb(int)");
     } else {
         IOEventInfo info = { event };
         callback(info);