X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FListNParser.hh;h=8ee812457e6718f9adb028d1b1d4ace302056e38;hb=c45c112ae88196ea8da9c5a9efb0e167196744d2;hp=08cf568d66066332722c046e938874df4781fbbc;hpb=8f1a688cea76f2e76bfa0193dff9c1538929147e;p=senf.git diff --git a/Packets/ListNParser.hh b/Packets/ListNParser.hh index 08cf568..8ee8124 100644 --- a/Packets/ListNParser.hh +++ b/Packets/ListNParser.hh @@ -23,8 +23,8 @@ /** \file \brief ListNParser public header */ -#ifndef HH_ListNParser_ -#define HH_ListNParser_ 1 +#ifndef HH_SENF_Packets_ListNParser_ +#define HH_SENF_Packets_ListNParser_ 1 // Custom includes #include "ListParser.hh" @@ -35,49 +35,12 @@ ///////////////////////////////hh.p//////////////////////////////////////// namespace senf { - - /** \brief List parser with size-field giving number of list elements - - This parser will parse a list which size is giving by a preceding field containing the - number of list elements. This struct is just a 'template typedef': - \code - senf::VectorNParser< Parser_UInt32, Parser_UInt16 >::parser MyVectorParser; - senf::ListNParser< MyVectorParser, UInt16Parser >::parser MyListParser; - \endcode - This first defines a Vector of 32 bit unsigned integers with 16 bit length counter. Then it - defines a list of such vectors with a 16 bit size field. - - \see ListParser - \ingroup parsecollection - */ - template - struct ListNParser { - typedef ListParser< detail::ListNParser_Policy< - ElementParser, - detail::PrefixAuxParserPolicy > > parser; - }; - - /** \brief Define ListNParser field - - This macro is a special helper to define a senf::ListNParser type field, a list of elements - of type \a elt_type (a parser type) directly preceded by a numeric size field of type \a - size_type (another parser type). - - \param[in] name field name - \param[in] elt_type list element type - \param[in] size_type size type - \hideinitializer - \ingroup packetparsermacros - */ -# define SENF_PARSER_LIST_N(name, elt_type, size_type) \ - typedef senf::ListNParser::parser BOOST_PP_CAT(name, _list_t); \ - SENF_PARSER_FIELD( name, BOOST_PP_CAT(name, _list_t) ) } ///////////////////////////////hh.e//////////////////////////////////////// #endif -#if !defined(HH_Packets__decls_) && !defined(HH_ListNParser_i_) -#define HH_ListNParser_i_ +#if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_ListNParser_i_) +#define HH_SENF_Packets_ListNParser_i_ //#include "ListNParser.cci" #include "ListNParser.ct" #include "ListNParser.cti"