X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FAnnotationRouter.hh;h=b3bcd69cb78d9a8fe5971ed2676643c6fc5c33a7;hb=99c145da3884f5c20a74337927ef2cbc073d80d7;hp=6f4300c87e1e01d2b4b6b05d0e010a9b2000abd4;hpb=45b346fa3a120720280b67b0f405b1954c0885d4;p=senf.git diff --git a/senf/PPI/AnnotationRouter.hh b/senf/PPI/AnnotationRouter.hh index 6f4300c..b3bcd69 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 @@ -34,7 +34,7 @@ #include "MultiConnectorMixin.hh" //#include "AnnotationRouter.mpp" -///////////////////////////////hh.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace senf { namespace ppi { @@ -51,7 +51,7 @@ namespace module { The \a AnnotationType template parameter defines the routing key. This annotation must support the following operations: \li Comparison with '<' (\c LessThanComparable concept) - \li Copy construction and copy assignment (\c Copyable und \c Assignable concepts) + \li Copy construction and copy assignment (\c Copyable and \c Assignable concepts) (e.g. via compiler synthesized copy constructor and assignment operator) \li Output streaming to an ostream via '\c <<' (for error description purposes) (\c OutputStreamable concept) @@ -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 > @@ -108,7 +108,7 @@ namespace module { 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)); } }; @@ -123,7 +123,7 @@ namespace module { }}} -///////////////////////////////hh.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// //#include "AnnotationRouter.cci" #include "AnnotationRouter.ct" //#include "AnnotationRouter.cti"