Packets/80221Bundle: more GenericTLVBase integration; removed GenericTLVPacket; some...

[senf.git] / senf / Packets / GenericTLV.cti

diff --git a/senf/Packets/GenericTLV.cti b/senf/Packets/GenericTLV.cti
index f66eec3..a5d39b5 100644 (file)
--- a/senf/Packets/GenericTLV.cti
+++ b/senf/Packets/GenericTLV.cti
@@ -33,7 +33,7 @@
 template <class Base>
 prefix_ senf::PacketParserBase::size_type senf::GenericTLVParserBase<Base>::bytes()
 {
-    return senf::init_bytes<Base>::value + this->length();
+    return senf::bytes(self()) + this->length();
 }
 
 template <class Base>
@@ -46,6 +46,7 @@ prefix_ void senf::GenericTLVParserBase<Base>::init()
 template <class Base>
 template <class Parser>
 prefix_ Parser senf::GenericTLVParserBase<Base>::as()
+    const
 {
     return Parser(this->i(), this->state() );
 }
@@ -53,11 +54,27 @@ prefix_ Parser senf::GenericTLVParserBase<Base>::as()
 template <class Base>
 template <class Parser>
 prefix_ bool senf::GenericTLVParserBase<Base>::is()
+    const
 {
     return this->type().value() == Parser::TYPEID;
 }
 
 template <class Base>
+prefix_ Base & senf::GenericTLVParserBase<Base>::self()
+{
+    return *static_cast<Base *>(this);
+}
+
+template <class Base>
+prefix_ Base const & senf::GenericTLVParserBase<Base>::self()
+    const
+{
+    return *static_cast<Base const *>(this);
+}
+
+#ifndef DOXYGEN
+
+template <class Base>
 template <class ForwardReadableRange>
 prefix_ void senf::GenericTLVParserBase<Base>::value(
         ForwardReadableRange const & val,
@@ -85,6 +102,8 @@ prefix_ void senf::GenericTLVParserBase<Base>::value(
     value_( val.second); 
 }
 
+#endif
+
 ///////////////////////////////cti.e///////////////////////////////////////
 #undef prefix_