Packets: Fix annotation unit-test on 64bit architectures

[senf.git] / senf / Packets / PacketInterpreter.cci

diff --git a/senf/Packets/PacketInterpreter.cci b/senf/Packets/PacketInterpreter.cci
index fef8049..b5e84bb 100644 (file)
--- a/senf/Packets/PacketInterpreter.cci
+++ b/senf/Packets/PacketInterpreter.cci
@@ -116,7 +116,15 @@ prefix_ senf::PacketInterpreterBase::PacketInterpreterBase(detail::PacketImpl *
     : PacketData(std::distance(impl->begin(),b),
                  std::distance(impl->begin(),e))
 {
-        impl->prependInterpreter(this);
+    impl->prependInterpreter(this);
+}
+
+prefix_ senf::PacketInterpreterBase::PacketInterpreterBase(detail::PacketImpl * impl,
+                                                           iterator b, iterator e, ptr before)
+    : PacketData(std::distance(impl->begin(),b),
+                 std::distance(impl->begin(),e))
+{
+    impl->prependInterpreter(this, before.get());
 }
 
 prefix_ senf::PacketInterpreterBase::ptr
@@ -146,7 +154,7 @@ prefix_ void senf::PacketInterpreterBase::add_ref()
 
 prefix_ bool senf::PacketInterpreterBase::release()
 {
-    if (impl_) 
+    if (impl_)
         // This call will set impl_ to 0 if we just removed the last reference ...
         impl_->release();
     return intrusive_refcount_t<PacketInterpreterBase>::release() && !impl_;
@@ -156,14 +164,14 @@ prefix_ bool senf::PacketInterpreterBase::release()
 
 prefix_ void senf::PacketInterpreterBase::assignImpl(detail::PacketImpl * impl)
 {
-    SENF_ASSERT(!impl_);
+    SENF_ASSERT(!impl_, "Internal failure: PacketInterpreter added to two Packets");
     impl_ = impl;
     impl_->add_ref(refcount());
 }
 
 prefix_ void senf::PacketInterpreterBase::releaseImpl()
 {
-    SENF_ASSERT(impl_);
+    SENF_ASSERT(impl_, "Internal failure: release of lone PacketInterpreter");
     refcount_t refc (refcount());
     if (refc) {
         impl_->release(refc);