X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2Fdetail%2FEventBinding.hh;h=7cbbeaf029d7e1ec0e95c4c58a696565cba985b1;hb=c505c034e5fdc932c02aa3dc3847a5551011d87e;hp=f4898797c880a10dbd93149ee70d7f517e32f39c;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git diff --git a/senf/PPI/detail/EventBinding.hh b/senf/PPI/detail/EventBinding.hh index f489879..7cbbeaf 100644 --- a/senf/PPI/detail/EventBinding.hh +++ b/senf/PPI/detail/EventBinding.hh @@ -27,8 +27,8 @@ #define HH_SENF_PPI_detail_EventBinding_ 1 // Custom includes -#include "../../Scheduler/ClockService.hh" -#include "../predecl.hh" +#include +#include #include "Callback.hh" //#include "EventBinding.mpp" @@ -46,9 +46,9 @@ namespace detail { EventManager & manager() const; module::Module & module() const; - + protected: - EventBindingBase(EventManager & manager, module::Module & module, + EventBindingBase(EventManager & manager, module::Module & module, EventDescriptor & descriptor); void eventTime(ClockService::clock_type time); @@ -59,6 +59,7 @@ namespace detail { EventDescriptor * descriptor_; friend class senf::ppi::EventManager; + friend class senf::ppi::EventDescriptor; }; /** \brief Internal: Callback forwarders @@ -71,7 +72,7 @@ namespace detail { void callback(EventArg event, ClockService::clock_type time); void callback(EventArg event); - + private: Self & self(); }; @@ -84,7 +85,7 @@ namespace detail { public: void callback(ClockService::clock_type time); void callback(); - + private: Self & self(); }; @@ -94,7 +95,7 @@ namespace detail { /** \brief Internal: Association Event - Module - Handler, event type specific */ template class EventBinding - : public EventBindingBase, + : public EventBindingBase, public EventBindingHelper > { public: