X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacket.cti;h=afae6069db5e853e17975d293110966a69f754b4;hb=a1fdb7bb122f0b05be809a922d4b7ef5e125fa67;hp=e16f88e8caf99557f572ad33cddc2497baff208c;hpb=d2459b6c8249291588fd3d0d125ed3d38e003b55;p=senf.git

diff --git a/Packets/Packet.cti b/Packets/Packet.cti
index e16f88e..afae606 100644
--- a/Packets/Packet.cti
+++ b/Packets/Packet.cti
@@ -128,6 +128,26 @@ prefix_ OtherPacket senf::Packet::first()
     return first().as<OtherPacket>();
 }
 
+template <class Other>
+prefix_ void senf::Packet::finalizeTo()
+{
+    Packet p (find<Other>(nothrow));
+    ptr()->finalizeTo(p ? p.ptr() : last().ptr());
+}
+
+template <class Annotation>
+prefix_ Annotation & senf::Packet::annotation()
+{
+    return ptr()->annotation<Annotation>();
+}
+
+template <class Annotation>
+prefix_ Annotation const & senf::Packet::annotation()
+    const
+{
+    return ptr()->annotation<Annotation>();
+}
+
 ///////////////////////////////////////////////////////////////////////////
 // senf::ConcretePacket<PacketType>
 
@@ -174,6 +194,8 @@ senf::ConcretePacket<PacketType>::create(size_type size, senf::NoInit_t)
     return ConcretePacket(interpreter::create(size,senf::noinit));
 }
 
+#ifndef DOXYGEN
+
 template <class PacketType>
 template <class ForwardReadableRange>
 prefix_ senf::ConcretePacket<PacketType> senf::ConcretePacket<PacketType>::
@@ -183,57 +205,64 @@ create(ForwardReadableRange const & range,
     return ConcretePacket(interpreter::create(range));
 }
 
+#endif
+
 // Create packet as new packet after a given packet
 
 template <class PacketType>
 prefix_ senf::ConcretePacket<PacketType>
-senf::ConcretePacket<PacketType>::createAfter(Packet packet)
+senf::ConcretePacket<PacketType>::createAfter(Packet const & packet)
 {
     return ConcretePacket(interpreter::createAfter(packet.ptr()));
 }
 
 template <class PacketType>
 prefix_ senf::ConcretePacket<PacketType>
-senf::ConcretePacket<PacketType>::createAfter(Packet packet, senf::NoInit_t)
+senf::ConcretePacket<PacketType>::createAfter(Packet const & packet, senf::NoInit_t)
 {
     return ConcretePacket(interpreter::createAfter(packet.ptr(),senf::noinit));
 }
 
 template <class PacketType>
 prefix_ senf::ConcretePacket<PacketType>
-senf::ConcretePacket<PacketType>::createAfter(Packet packet, size_type size)
+senf::ConcretePacket<PacketType>::createAfter(Packet const & packet, size_type size)
 {
     return ConcretePacket(interpreter::createAfter(packet.ptr(), size));
 }
 
 template <class PacketType>
 prefix_ senf::ConcretePacket<PacketType>
-senf::ConcretePacket<PacketType>::createAfter(Packet packet, size_type size, senf::NoInit_t)
+senf::ConcretePacket<PacketType>::createAfter(Packet const & packet, size_type size, 
+                                              senf::NoInit_t)
 {
     return ConcretePacket(interpreter::createAfter(packet.ptr(), size, senf::noinit));
 }
 
+#ifndef DOXYGEN
+
 template <class PacketType>
 template <class ForwardReadableRange>
 prefix_ senf::ConcretePacket<PacketType> senf::ConcretePacket<PacketType>::
-createAfter(Packet packet, ForwardReadableRange const & range,
+createAfter(Packet const & packet, ForwardReadableRange const & range,
             typename boost::disable_if< boost::is_integral<ForwardReadableRange> >::type *)
 {
     return ConcretePacket(interpreter::createAfter(packet.ptr(), range));
 }
 
+#endif
+
 // Create packet as new packet (header) before a given packet
 
 template <class PacketType>
 prefix_ senf::ConcretePacket<PacketType>
-senf::ConcretePacket<PacketType>::createBefore(Packet packet)
+senf::ConcretePacket<PacketType>::createBefore(Packet const & packet)
 {
     return ConcretePacket(interpreter::createBefore(packet.ptr()));
 }
 
 template <class PacketType>
 prefix_ senf::ConcretePacket<PacketType>
-senf::ConcretePacket<PacketType>::createBefore(Packet packet, senf::NoInit_t)
+senf::ConcretePacket<PacketType>::createBefore(Packet const & packet, senf::NoInit_t)
 {
     return ConcretePacket(interpreter::createBefore(packet.ptr(), senf::noinit));
 }
@@ -251,19 +280,19 @@ senf::ConcretePacket<PacketType>::clone()
 // Field access
 
 template <class PacketType>
-prefix_ typename senf::ConcretePacket<PacketType>::Parser *
-senf::ConcretePacket<PacketType>::operator->()
+prefix_ typename senf::ConcretePacket<PacketType>::Parser
+senf::ConcretePacket<PacketType>::parser()
     const
 {
-    return ptr()->fields_p();
+    return ptr()->fields();
 }
 
 template <class PacketType>
-prefix_ typename senf::ConcretePacket<PacketType>::Parser
-senf::ConcretePacket<PacketType>::parser()
+prefix_ typename senf::ConcretePacket<PacketType>::ParserProxy
+senf::ConcretePacket<PacketType>::operator->()
     const
 {
-    return ptr()->fields();
+    return ParserProxy(parser());
 }
 
 // private members