X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FIOEvent.cc;h=c39d57a1f93c4b9e2d4e90cf36458eac98fef08b;hb=489be2bbd4d03259a17df14e4962a4524cd5b654;hp=b63ca240dc34211ec2accbf732c212accb947e1d;hpb=53a3d02e7fde841badf42555eba87ccef4566073;p=senf.git diff --git a/PPI/IOEvent.cc b/PPI/IOEvent.cc index b63ca24..c39d57a 100644 --- a/PPI/IOEvent.cc +++ b/PPI/IOEvent.cc @@ -1,8 +1,8 @@ // $Id$ // -// Copyright (C) 2007 -// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS) -// Kompetenzzentrum fuer Satelitenkommunikation (SatCom) +// Copyright (C) 2007 +// Fraunhofer Institute for Open Communication Systems (FOKUS) +// Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Bund // // This program is free software; you can redistribute it and/or modify @@ -27,6 +27,7 @@ //#include "IOEvent.ih" // Custom includes +#include "../Utils/senfassert.hh" #include //#include "IOEvent.mpp" @@ -41,7 +42,7 @@ prefix_ void senf::ppi::IOEvent::v_enable() { - Scheduler::instance().add(fd_, boost::bind(&IOEvent::cb,this,_1,_2), + Scheduler::instance().add(fd_, boost::bind(&IOEvent::cb,this,_1), Scheduler::EventId(events_)); } @@ -50,7 +51,7 @@ prefix_ void senf::ppi::IOEvent::v_disable() Scheduler::instance().remove(fd_, Scheduler::EventId(events_)); } -prefix_ void senf::ppi::IOEvent::cb(int, Scheduler::EventId event) +prefix_ void senf::ppi::IOEvent::cb(Scheduler::EventId event) { if ((event & ~events_) != 0) { if (event & Err) @@ -59,7 +60,7 @@ prefix_ void senf::ppi::IOEvent::cb(int, Scheduler::EventId event) throw HangupException(); else // This cannot happen. - BOOST_ASSERT(false); + SENF_ASSERT(false); } else { IOEventInfo info = { event }; callback(info);