X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FVariantParser.ct;h=63b46dcfb129f6e7fbaef3cc5e0ede3fb7c868be;hb=bd9f9d3fd6fbcff0112a7bf48ab9284da9576b11;hp=bae313928d306a3e015bb5f65b7d69356722a7bd;hpb=380525e28d9a2a2758dedcb4875b5c3755303344;p=senf.git

diff --git a/Packets/VariantParser.ct b/Packets/VariantParser.ct
index bae3139..63b46dc 100644
--- a/Packets/VariantParser.ct
+++ b/Packets/VariantParser.ct
@@ -35,7 +35,7 @@ template <class AuxPolicy, class Parsers>
 template <unsigned N>
 prefix_ void senf::VariantParser<AuxPolicy,Parsers>::init()
 {
-    unsigned oldSize( bytes() );
+    size_type oldSize( bytes() );
     typedef typename boost::mpl::at<parsers, boost::mpl::int_<N> >::type NewParser;
 
     if (oldSize < senf::init_bytes<NewParser>::value) {
@@ -43,9 +43,10 @@ prefix_ void senf::VariantParser<AuxPolicy,Parsers>::init()
         std::advance(j, oldSize);
         std::fill(i(), j, 0u);
         safe_data_iterator safe_i (*this);
+        typename AuxPolicy::WrapperPolicy safeAux (static_cast<AuxPolicy&>(*this));
         data().insert(j, senf::init_bytes<NewParser>::value - oldSize, 0u);
-        AuxPolicy::aux(N, safe_i, state());
-        NewParser( AuxPolicy::adjust(safe_i, state()), state() ).init();
+        safeAux.aux(N, safe_i, state());
+        NewParser( safeAux.adjust(safe_i, state()), state() ).init();
     } else {
         data_iterator j (i());
         std::advance(j, senf::init_bytes<NewParser>::value);
@@ -59,7 +60,7 @@ prefix_ void senf::VariantParser<AuxPolicy,Parsers>::init()
 ///////////////////////////////ct.e////////////////////////////////////////
 #undef prefix_
 
-
+
 // Local Variables:
 // mode: c++
 // fill-column: 100