X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacketParser.cti;h=5d27c622ed0b8b39a9712244df0ccab66212a19f;hb=d6abda313f70c8a849c5e3f3bbfc12ce301789f1;hp=826f06654499acfe6d4b83b60c239a23788bd846;hpb=f13c1275e48e97dceb7de7925793a4c69a5aeb61;p=senf.git

diff --git a/Packets/PacketParser.cti b/Packets/PacketParser.cti
index 826f066..5d27c62 100644
--- a/Packets/PacketParser.cti
+++ b/Packets/PacketParser.cti
@@ -46,10 +46,6 @@ prefix_ Parser senf::PacketParserBase::parse(size_type n)
     return Parser(boost::next(i(),n),state());
 }
 
-prefix_ void senf::PacketParserBase::defaultInit()
-    const
-{}
-
 ///////////////////////////////////////////////////////////////////////////
 // namespace members
 
@@ -59,6 +55,7 @@ prefix_ senf::PacketParserBase::size_type senf::bytes(Parser p)
     return detail::packetParserSize(p,0);
 }
 
+#ifndef DOXYGEN
 template <class Parser, class Value>
 prefix_ typename boost::enable_if_c < 
         boost::is_base_of<senf::PacketParserBase, Parser>::value 
@@ -68,10 +65,33 @@ prefix_ typename boost::enable_if_c <
     target.value(value);
     return target;
 }
+#else
+template <class Parser, class Value>
+prefix_ Parser senf::operator<<(Parser target, Value const & value)
+{}
+#endif
+
+#ifndef DOXYGEN
+template <class Parser, class Value>
+prefix_ typename boost::enable_if_c < 
+        boost::is_base_of<senf::PacketParserBase, Parser>::value 
+            && ! boost::is_base_of<senf::PacketParserBase, Value>::value,
+        Parser >::type senf::operator<<(Parser target, boost::optional<Value> const & value)
+{
+    if (value)
+        target.value(*value);
+    return target;
+}
+#else
+template <class Parser, class Value>
+prefix_ Parser senf::operator<<(Parser target, Value const & value)
+{}
+#endif
+
 
 template <class Parser>
 prefix_ senf::PacketParserBase::size_type
-senf::detail::packetParserSize(Parser p, int, Parser_TakeNum<Parser::fixed_bytes> *)
+senf::detail::packetParserSize(Parser p, int, senf::mpl::take_uint<Parser::fixed_bytes> *)
 {
     return Parser::fixed_bytes;
 }
@@ -87,7 +107,7 @@ prefix_ senf::PacketParserBase::size_type senf::detail::packetParserSize(Parser
 
 template <class Parser>
 prefix_ senf::SafePacketParser<Parser>::SafePacketParser()
-    : i_()
+    : parser_(), i_()
 {}
 
 template <class Parser>