X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FIOEvent.hh;h=d2f952819a3fb89806b3ddecef3663066e5b47c7;hb=ef4c5558d6a52367bd7040530d40c7616f6f5b71;hp=8e185326b79a53f412588551c0bd6becae367fdf;hpb=21bad90912447cd2d390112cf2d2a7d383ad8058;p=senf.git diff --git a/PPI/IOEvent.hh b/PPI/IOEvent.hh index 8e18532..d2f9528 100644 --- a/PPI/IOEvent.hh +++ b/PPI/IOEvent.hh @@ -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,8 +27,9 @@ #define HH_IOEvent_ 1 // Custom includes -#include "Scheduler/Scheduler.hh" +#include "../Scheduler/Scheduler.hh" #include "Events.hh" +#include "../Utils/Exception.hh" //#include "IOEvent.mpp" ///////////////////////////////hh.p//////////////////////////////////////// @@ -94,14 +95,12 @@ namespace ppi { /////////////////////////////////////////////////////////////////////////// /** \brief Unhandled error condition */ - struct ErrorException : public std::exception - { virtual char const * what() const throw() - { return "senf::ppi::IOEvent::ErrorException"; } }; + struct ErrorException : public senf::Exception + { ErrorException() : senf::Exception("senf::ppi::IOEvent::ErrorException"){} }; /** \brief Unhandled hangup condition */ - struct HangupException : public std::exception - { virtual char const * what() const throw() - { return "senf::ppi::IOEvent::HangupException"; } }; + struct HangupException : public senf::Exception + { HangupException() : senf::Exception("senf::ppi::IOEvent::HangupException"){} }; protected: @@ -109,7 +108,7 @@ namespace ppi { virtual void v_enable(); virtual void v_disable(); - void cb(int, Scheduler::EventId event); + void cb(Scheduler::EventId event); int fd_; unsigned events_;