X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FVariantParser.ih;h=f32ae57f77058c1ee359f0b313a51eb228f26534;hb=9bc655e14d2d8c204ed835896cb51e42d49bd68f;hp=f485bb228d616ca112bdbaca1277a4de2aaed89b;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git diff --git a/senf/Packets/VariantParser.ih b/senf/Packets/VariantParser.ih index f485bb2..f32ae57 100644 --- a/senf/Packets/VariantParser.ih +++ b/senf/Packets/VariantParser.ih @@ -63,7 +63,7 @@ namespace detail { template struct VariantParserPolicy - : public VariantParserPolicy< void, + : public VariantParserPolicy< void, TransformAuxParserPolicy, AuxTag > {}; @@ -75,8 +75,8 @@ namespace detail { template struct VariantParserPolicy > { typedef TransformAuxParserPolicy type; @@ -93,8 +93,8 @@ namespace detail { }; }; - template - struct VariantKey + template + struct VariantKey { static T key() { return (*KeyFn)(); } }; @@ -121,7 +121,7 @@ namespace detail { static Out get(In v); static In set(Out v); }; - + # define SENF_PARSER_VARIANT_I(access, name, chooser, types) \ SENF_PARSER_REQUIRE_VAR(variant) \ protected: \ @@ -185,7 +185,7 @@ namespace detail { # define SENF_PARSER_VARIANT_IFNOTNA(id, x) \ BOOST_PP_EXPR_IIF( BOOST_PP_NOT( SENF_PARSER_VARIANT_NA(id) ), x ) - + # define SENF_PARSER_VARIANT_MAKEACCESSOR_VALUE(name, i, elem, id) \ SENF_PARSER_VARIANT_IFNOTNA( id, \ typedef SENF_PARSER_VARIANT_GETTYPE(elem) \ @@ -193,7 +193,7 @@ namespace detail { BOOST_PP_CAT(id, _t) id() const \ { return name().get(); } \ ) - + # define SENF_PARSER_VARIANT_MAKEACCESSOR_HAS(name, i, elem, id) \ SENF_PARSER_VARIANT_IFNOTNA( id, \ bool id() const \