X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FPacket.cci;h=3bd0522dbe0e490c556d26ec94275a8af06711e8;hb=7ee689fe38d66aa3a0004d55e8708750d35adc0b;hp=6e9d735441167a626f27d739c6cdb32c6ad561dd;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Packets/Packet.cci b/senf/Packets/Packet.cci
index 6e9d735..3bd0522 100644
--- a/senf/Packets/Packet.cci
+++ b/senf/Packets/Packet.cci
@@ -24,24 +24,24 @@
     \brief Packet inline non-template implementation */
 
 // Custom includes
-#include "../Utils/senfassert.hh"
+#include <senf/Utils/senfassert.hh>
 
 #define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::Packet
 
 // protected members
 
-prefix_  senf::Packet::Packet(PacketInterpreterBase::ptr packet)
+prefix_  senf::Packet::Packet(PacketInterpreterBase::ptr const & packet)
     : packet_(packet)
 {}
 
-prefix_ senf::PacketInterpreterBase::ptr senf::Packet::ptr()
+prefix_ senf::PacketInterpreterBase::ptr const & senf::Packet::ptr()
     const
 {
-    SENF_ASSERT(packet_);
+    SENF_ASSERT(packet_, "Invalid operation (dereferencing) on in-valid() Packet");
     return packet_;
 }
 
@@ -64,7 +64,9 @@ prefix_ senf::Packet senf::Packet::next(NoThrow_t)
     const
 {
     PacketInterpreterBase::ptr p (ptr()->next());
-    return !p && ptr()->nextPacketRange() ? checkNext() : Packet(p);
+    if (p) return Packet(p);
+    PacketInterpreterBase::optional_range r (ptr()->nextPacketRange());
+    return (r && ! r->empty()) ? getNext() : Packet();
 }
 
 prefix_ senf::Packet senf::Packet::next()
@@ -99,7 +101,7 @@ prefix_ senf::Packet senf::Packet::last()
     const
 {
     Packet p (ptr()->last());
-    return p.next(nothrow) ? checkLast() : p;
+    return p.next(nothrow) ? getLast() : p;
 }
 
 prefix_ senf::Packet senf::Packet::parseNextAs(factory_t factory)
@@ -128,7 +130,6 @@ prefix_ senf::Packet::size_type senf::Packet::size()
     return data().size();
 }
 
-
 // Other methods
 
 prefix_ bool senf::Packet::operator==(Packet const & other)
@@ -152,13 +153,6 @@ prefix_ void senf::Packet::finalizeAll()
     ptr()->finalizeTo(last().ptr());
 }
 
-prefix_ void senf::Packet::dump(std::ostream & os)
-    const
-{
-    last(); // Make sure the packet is complete
-    ptr()->dump(os);
-}
-
 prefix_ senf::TypeIdValue senf::Packet::typeId()
     const
 {
@@ -189,6 +183,23 @@ prefix_ bool senf::Packet::valid()
     return *this;
 }
 
+prefix_ bool senf::Packet::is_shared()
+    const
+{
+    return ptr()->is_shared() || (ptr()->impl().refcount() > 1);
+}
+
+prefix_ void senf::Packet::reparse()
+    const
+{
+    return ptr()->reparse();
+}
+
+prefix_ void senf::Packet::clearAnnotations()
+{
+    return ptr()->clearAnnotations();
+}
+
 template <class PacketType, class Parser>
 prefix_ Parser senf::operator<<(Parser target, ConcretePacket<PacketType> const & packet)
 {
@@ -196,7 +207,7 @@ prefix_ Parser senf::operator<<(Parser target, ConcretePacket<PacketType> const
     return target;
 }
 
-///////////////////////////////cci.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_