X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FAnnotationRouter.hh;h=fa4fbc5f5afb827de6f3848beca284873edfc158;hb=9bc655e14d2d8c204ed835896cb51e42d49bd68f;hp=e438755ba452dd5c0c0e1406ce58ad852282ce7c;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git diff --git a/senf/PPI/AnnotationRouter.hh b/senf/PPI/AnnotationRouter.hh index e438755..fa4fbc5 100644 --- a/senf/PPI/AnnotationRouter.hh +++ b/senf/PPI/AnnotationRouter.hh @@ -1,6 +1,6 @@ // $Id$ // -// Copyright (C) 2008 +// Copyright (C) 2008 // Fraunhofer Institute for Open Communication Systems (FOKUS) // Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Bund @@ -28,7 +28,7 @@ // Custom includes #include -#include "../Utils/String.hh" +#include #include "Module.hh" #include "Connectors.hh" #include "MultiConnectorMixin.hh" @@ -62,10 +62,10 @@ namespace module { { senf::MACAddress mac; - bool operator< (TargetInterface const & other) + bool operator< (TargetInterface const & other) { return mac < other.mac; } - TargetInterface(senf::MACAddress const & m) + TargetInterface(senf::MACAddress const & m) : mac (m) {} }; @@ -91,11 +91,11 @@ namespace module { \ingroup routing_modules \todo Call Module::v_init() on every connection change and remove disconnected connections - from the container + from the container */ template - class AnnotationRouter - : public Module, + class AnnotationRouter + : public Module, public MultiConnectorMixin< AnnotationRouter, connector::ActiveOutput<>, AnnotationType > @@ -104,11 +104,11 @@ namespace module { public: connector::PassiveInput<> input; connector::ActiveOutput<> defaultOutput; - + AnnotationRouter(); struct DuplicateKeyException : public senf::Exception - { DuplicateKeyException(AnnotationType const & key) + { DuplicateKeyException(AnnotationType const & key) : senf::Exception("Duplicate senf::ppi::module::AnnotationRouter routing key ") { append( senf::str(key)); } };