From: tho Date: Wed, 21 Apr 2010 08:21:36 +0000 (+0000) Subject: Utils: fixed typo on TypeIdValue X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=57524bfa72e4536b15700a83eae94093ed32106a;hp=209950ee5f6898978cd68614ef339ae3531c5c53;p=senf.git Utils: fixed typo on TypeIdValue added svn::keyword property git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1599 270642c3-0616-0410-b53a-bc976706d245 --- diff --git a/senf/PPI/MultiConnectorMixin.hh b/senf/PPI/MultiConnectorMixin.hh index e9b42b0..34a784f 100644 --- a/senf/PPI/MultiConnectorMixin.hh +++ b/senf/PPI/MultiConnectorMixin.hh @@ -94,13 +94,13 @@ namespace module { namespace detail { class MultiConnectorMixinAccess; } - /** \brief Multi connector management + /** \brief Multi-Connector management This mixin provides a module with support for a runtime configurable number of input or output connectors. \code class MyModule - : public senf::ppi::module::Modulem, + : public senf::ppi::module::Module, public senf::ppi::module::MultiConnectorMixin< MyModule, senf::ppi::connector::ActiveInput<> > { @@ -129,7 +129,7 @@ namespace module { } friend class senf::ppi::module::MultiConnectorMixin< - MyModule, senf::ppi::connector::ActiveInput<> > + MyModule, senf::ppi::connector::ActiveInput<> >; } \endcode @@ -202,7 +202,7 @@ namespace module { \par "Advanced note:" These additional arguments are always passed by const-reference. If you need to pass a non-const reference, declare the \c connectorSetup() argument as non-const reference and wrap the real argument using \c boost::ref() (The reason for - this is known as 'The forwarding problem' + this is known as 'The forwarding problem'). \section senf_ppi_multiconnector_advanced Advanced usage: Managing your own container diff --git a/senf/Packets/DefaultBundle/ICMPv6TypePacket.hh b/senf/Packets/DefaultBundle/ICMPv6TypePacket.hh index 4561fd8..4639499 100644 --- a/senf/Packets/DefaultBundle/ICMPv6TypePacket.hh +++ b/senf/Packets/DefaultBundle/ICMPv6TypePacket.hh @@ -32,6 +32,7 @@ #include "ListOptionTypeParser.hh" #include "NDPOptions.hh" +///////////////////////////////hh.p//////////////////////////////////////// namespace senf { //############################################################# @@ -657,6 +658,10 @@ namespace senf { typedef ConcretePacket NDPRedirectMessage; } +///////////////////////////////hh.e//////////////////////////////////////// +//#include "ICMPv6TypePacket.cci" +//#include "ICMPv6TypePacket.ct" +//#include "ICMPv6TypePacket.cti" #endif diff --git a/senf/Packets/DefaultBundle/IPv6ExtOptions.hh b/senf/Packets/DefaultBundle/IPv6ExtOptions.hh index aef3db9..8fb5fdd 100644 --- a/senf/Packets/DefaultBundle/IPv6ExtOptions.hh +++ b/senf/Packets/DefaultBundle/IPv6ExtOptions.hh @@ -1,4 +1,4 @@ -// $Id: IPv6ExtOptionType.hh 869 2008-06-09 13:57:27Z pug $ +// $Id$ // // Copyright (C) 2009 // Fraunhofer Institute for Open Communication Systems (FOKUS) diff --git a/senf/Packets/DefaultBundle/IPv6Packet.hh b/senf/Packets/DefaultBundle/IPv6Packet.hh index 4986d3e..251dfa7 100644 --- a/senf/Packets/DefaultBundle/IPv6Packet.hh +++ b/senf/Packets/DefaultBundle/IPv6Packet.hh @@ -1,4 +1,4 @@ -// $Id: EthernetPacket.hh 299 2007-07-10 21:23:49Z g0dil $ +// $Id$ // // Copyright (C) 2007 // Fraunhofer Institute for Open Communication Systems (FOKUS) diff --git a/senf/Packets/DefaultBundle/ListOptionTypeParser.cti b/senf/Packets/DefaultBundle/ListOptionTypeParser.cti index 2a3bdec..82297ca 100644 --- a/senf/Packets/DefaultBundle/ListOptionTypeParser.cti +++ b/senf/Packets/DefaultBundle/ListOptionTypeParser.cti @@ -1,4 +1,4 @@ -// $Id: ListOptionTypeParser.cti 869 2008-06-09 13:57:27Z pug $ +// $Id$ // // Copyright (C) 2009 // Fraunhofer Institute for Open Communication Systems (FOKUS) diff --git a/senf/Packets/DefaultBundle/ListOptionTypeParser.hh b/senf/Packets/DefaultBundle/ListOptionTypeParser.hh index 90deeca..f6fb70b 100644 --- a/senf/Packets/DefaultBundle/ListOptionTypeParser.hh +++ b/senf/Packets/DefaultBundle/ListOptionTypeParser.hh @@ -1,4 +1,4 @@ -// $Id: ListOptionTypeParser.hh 965 2008-11-18 16:04:20Z pug $ +// $Id$ // // Copyright (C) 2009 // Fraunhofer Institute for Open Communication Systems (FOKUS) diff --git a/senf/Packets/DefaultBundle/ListOptionTypeParser.ih b/senf/Packets/DefaultBundle/ListOptionTypeParser.ih index da3d40e..da5a0d1 100644 --- a/senf/Packets/DefaultBundle/ListOptionTypeParser.ih +++ b/senf/Packets/DefaultBundle/ListOptionTypeParser.ih @@ -1,4 +1,4 @@ -// $Id: ListOptionTypeParser.ih 965 2008-11-18 16:04:20Z pug $ +// $Id$ // // Copyright (C) 2009 // Fraunhofer Institute for Open Communication Systems (FOKUS) diff --git a/senf/Packets/DefaultBundle/ListOptionTypeParser.test.cc b/senf/Packets/DefaultBundle/ListOptionTypeParser.test.cc index d2a7cf1..28f7f27 100644 --- a/senf/Packets/DefaultBundle/ListOptionTypeParser.test.cc +++ b/senf/Packets/DefaultBundle/ListOptionTypeParser.test.cc @@ -1,4 +1,4 @@ -// $Id: ListOptionTypeParser.test.cc 1345 2009-08-26 15:40:55Z pug $ +// $Id$ // // Copyright (C) 2009 // Fraunhofer Institute for Open Communication Systems (FOKUS) diff --git a/senf/Packets/DefaultBundle/NDPMessage.test.cc b/senf/Packets/DefaultBundle/NDPMessage.test.cc index 5c99be8..35b3392 100644 --- a/senf/Packets/DefaultBundle/NDPMessage.test.cc +++ b/senf/Packets/DefaultBundle/NDPMessage.test.cc @@ -1,4 +1,4 @@ -// $Id: ICMPv6Packet.test.cc 1550 2010-01-26 09:34:24Z tho $ +// $Id$ // // Copyright (C) 2010 // Fraunhofer Institute for Open Communication Systems (FOKUS) @@ -21,7 +21,7 @@ // 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /** \file - \brief ICMPv6Packet unit tests */ + \brief NDPMessage unit tests */ // Custom includes #include "ICMPv6Packet.hh" diff --git a/senf/Packets/DefaultBundle/NDPOptions.cc b/senf/Packets/DefaultBundle/NDPOptions.cc index 88a0a36..cc46aca 100644 --- a/senf/Packets/DefaultBundle/NDPOptions.cc +++ b/senf/Packets/DefaultBundle/NDPOptions.cc @@ -1,6 +1,6 @@ -// $Id: ICMPv6TypePacket.cc 1450 2009-09-28 09:39:01Z tho $ +// $Id$ // -// Copyright (C) 2008 +// Copyright (C) 2010 // Fraunhofer Institute for Open Communication Systems (FOKUS) // Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Sauer @@ -23,9 +23,6 @@ // Definition of non-inline non-template functions // Custom includes -#include -#include "ICMPv6Packet.hh" -#include "ICMPv6TypePacket.hh" #include "NDPOptions.hh" #define prefix_ diff --git a/senf/Packets/DefaultBundle/NDPOptions.hh b/senf/Packets/DefaultBundle/NDPOptions.hh index cefce55..488e5eb 100644 --- a/senf/Packets/DefaultBundle/NDPOptions.hh +++ b/senf/Packets/DefaultBundle/NDPOptions.hh @@ -1,4 +1,4 @@ -// $Id: ICMPv6TypePacket.hh 1449 2009-09-25 23:03:48Z g0dil $ +// $Id$ // // Copyright (C) 2010 // Fraunhofer Institute for Open Communication Systems (FOKUS) @@ -28,9 +28,11 @@ // Custom includes #include #include -#include +#include +///////////////////////////////hh.p//////////////////////////////////////// namespace senf { + //############################################################# //ICMPv6 Neighbor Discovery (RFC 4861) Options //############################################################# @@ -48,7 +50,7 @@ namespace senf { struct NDPSourceLLAddressTLVParser : public NDPOptionParser { -# include SENF_PARSER() +# include SENF_PARSER() SENF_PARSER_INHERIT ( NDPOptionParser ); SENF_PARSER_FIELD ( source, MACAddressParser); SENF_PARSER_FINALIZE ( NDPSourceLLAddressTLVParser); @@ -64,7 +66,7 @@ namespace senf { struct NDPTargetLLAddressTLVParser : public NDPOptionParser { -# include SENF_PARSER() +# include SENF_PARSER() SENF_PARSER_INHERIT ( NDPOptionParser ); SENF_PARSER_FIELD ( target, MACAddressParser ); SENF_PARSER_FINALIZE ( NDPTargetLLAddressTLVParser ); @@ -80,7 +82,7 @@ namespace senf { struct NDPPrefixInformationTLVParser : public NDPOptionParser { -# include SENF_PARSER() +# include SENF_PARSER() SENF_PARSER_INHERIT ( NDPOptionParser ); SENF_PARSER_FIELD ( prefixLength, UInt8Parser ); SENF_PARSER_BITFIELD ( l, 1, bool ); @@ -105,7 +107,7 @@ namespace senf { struct NDPMTUTLVParser : public NDPOptionParser { -# include SENF_PARSER() +# include SENF_PARSER() SENF_PARSER_INHERIT ( NDPOptionParser ); SENF_PARSER_PRIVATE_BITFIELD ( reserved, 16, unsigned ); SENF_PARSER_FIELD ( mtu, UInt32Parser ); @@ -122,9 +124,13 @@ namespace senf { }; } +///////////////////////////////hh.e//////////////////////////////////////// +//#include "NDPOptions.cci" +//#include "NDPOptions.ct" +//#include "NDPOptions.cti" #endif - + // Local Variables: // mode: c++ // fill-column: 100 diff --git a/senf/Packets/DefaultBundle/main.test.cc b/senf/Packets/DefaultBundle/main.test.cc index dc35e39..768c5aa 100644 --- a/senf/Packets/DefaultBundle/main.test.cc +++ b/senf/Packets/DefaultBundle/main.test.cc @@ -1,4 +1,4 @@ -// $Id: main.test.cc 206 2007-02-20 14:20:52Z g0dil $ +// $Id$ // // Copyright (C) 2006 // Fraunhofer Institute for Open Communication Systems (FOKUS) diff --git a/senf/Packets/main.test.hh b/senf/Packets/main.test.hh index ecd472c..df95156 100644 --- a/senf/Packets/main.test.hh +++ b/senf/Packets/main.test.hh @@ -1,4 +1,4 @@ -// $Id: TransportPacket.test.cc 560 2007-12-13 14:39:37Z tho $ +// $Id$ // // Copyright (C) 2007 // Fraunhofer Institute for Open Communication Systems (FOKUS) diff --git a/senf/Utils/TypeIdValue.cti b/senf/Utils/TypeIdValue.cti index a90b470..1bd58b6 100644 --- a/senf/Utils/TypeIdValue.cti +++ b/senf/Utils/TypeIdValue.cti @@ -37,7 +37,7 @@ prefix_ senf::TypeIdValue const senf::typeIdValue() } template -prefix_ senf::TypeIdValue const senf::typeidValue(Type const & ob) +prefix_ senf::TypeIdValue const senf::typeIdValue(Type const & ob) { return typeid(ob); } diff --git a/senf/Utils/TypeIdValue.hh b/senf/Utils/TypeIdValue.hh index d147f47..182c3c9 100644 --- a/senf/Utils/TypeIdValue.hh +++ b/senf/Utils/TypeIdValue.hh @@ -88,7 +88,7 @@ namespace senf { \related TypeIdValue */ template - TypeIdValue const typeidValue(Type const & ob); + TypeIdValue const typeIdValue(Type const & ob); /** \related TypeIdValue