X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FParseArray.test.cc;h=0ced2cf12d2847e3a0f5ab92e550eb73ff545401;hb=54eed72c506b09ef5b4be0b62fecedfbc0e3f261;hp=44b406d6bf25468ad1b3f1a0a6a1159434f7214c;hpb=2d6585ff852e9d282c17003ba1db0b73eb3a8500;p=senf.git diff --git a/Packets/ParseArray.test.cc b/Packets/ParseArray.test.cc index 44b406d..0ced2cf 100644 --- a/Packets/ParseArray.test.cc +++ b/Packets/ParseArray.test.cc @@ -40,23 +40,25 @@ namespace { struct SomePacketParser : public senf::PacketParserBase { - SENF_PACKET_PARSER_INIT(SomePacketParser); +# include SENF_FIXED_PARSER() typedef senf::Parse_Array<2,senf::Parse_UInt24> Parse_Array2; - SENF_PACKET_PARSER_DEFINE_FIXED_FIELDS( - ((Field)( array, Parse_Array2 )) - ((Field)( index, senf::Parse_UInt16 )) ); + SENF_PARSE_FIELD( array, Parse_Array2 ); + SENF_PARSE_FIELD( index, senf::Parse_UInt16 ); + + SENF_PARSER_FINALIZE(SomePacketParser); }; struct SomeOtherParser : public senf::PacketParserBase { - SENF_PACKET_PARSER_INIT(SomeOtherParser); +# include SENF_FIXED_PARSER() typedef senf::Parse_Array<1,SomePacketParser> Parse_Array1; - SENF_PACKET_PARSER_DEFINE_FIXED_FIELDS( - ((Field)( fields, Parse_Array1 )) ); + SENF_PARSE_FIELD( fields, Parse_Array1 ); + + SENF_PARSER_FINALIZE(SomeOtherParser); }; }