X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FParseHelpers.ih;h=b55c9a439d1937a2f628a393add14298d10d26a5;hb=ac86c2bb40746fbedf70a19af3307e5da642b04a;hp=64fca3f25ade14618160ef4921b793955242ad62;hpb=80fb5f1747c3d7fef29c70dac1ddae91a3706103;p=senf.git diff --git a/Packets/ParseHelpers.ih b/Packets/ParseHelpers.ih index 64fca3f..b55c9a4 100644 --- a/Packets/ParseHelpers.ih +++ b/Packets/ParseHelpers.ih @@ -105,7 +105,7 @@ BOOST_PP_CAT(SENF_PARSER_I_SIZE_, ofstype) (name, type), \ BOOST_PP_CAT(SENF_PARSER_I_INITBYTES_, ofstype) (name, type), \ access ) \ - BOOST_PP_CAT(SENF_PARSER_I_FIELD_VAL_, rwtype) (name, type, ofstype, access) \ + BOOST_PP_CAT(SENF_PARSER_I_FIELD_VAL_, rwtype) (name, type, access) \ public: # # //////////////////////////////////////// @@ -186,7 +186,7 @@ return parse( SENF_PARSER_OFFSET(name) ); \ } # -# define SENF_PARSER_I_FIELD_VAL_ro(name, type, ofstype, access) \ +# define SENF_PARSER_I_FIELD_VAL_ro(name, type, access) \ BOOST_PP_CAT(name, _t)::value_type name() const { \ return parse( SENF_PARSER_OFFSET(name) ).value(); \ } @@ -258,7 +258,7 @@ private: \ SENF_MPL_SLOT_SET(bitfield_size, BOOST_PP_CAT(name, _t)::fixed_bytes); \ access: \ - BOOST_PP_CAT(SENF_PARSER_I_FIELD_VAL_, rwtype) (name, type, ofstype, access) \ + BOOST_PP_CAT(SENF_PARSER_I_FIELD_VAL_, rwtype) (name, type, access) \ public: # # //////////////////////////////////////// @@ -368,6 +368,18 @@ # define SENF_PARSER_OFFSET_var(name) BOOST_PP_CAT(name, _offset)() # # /////////////////////////////////////////////////////////////////////////// +# // SENF_PARSER_FIXED_OFFSET_* +# +# define SENF_PARSER_FIXED_OFFSET_fix(name) BOOST_PP_CAT(name, _offset) +# define SENF_PARSER_FIXED_OFFSET_var(name) BOOST_PP_CAT(name, _init_bytes) +# +# /////////////////////////////////////////////////////////////////////////// +# // SENF_PARSER_FIXED_OFFSET_* +# +# define SENF_PARSER_CURRENT_FIXED_OFFSET_fix() SENF_MPL_SLOT_GET(offset) +# define SENF_PARSER_CURRENT_FIXED_OFFSET_var() SENF_MPL_SLOT_GET(init_bytes) +# +# /////////////////////////////////////////////////////////////////////////// # // SENF_PARSER_FINALIZE_* # # define SENF_PARSER_FINALIZE_var(name) \