X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacketImpl.cc;h=647d37f143a2634f2aed1ab976eef08cc2068eaf;hb=92f8630b75f3ef50e73c48cde58645dcd1534e27;hp=5b5e12fe0983023b5056328763388d4a0956181d;hpb=9348e1098d66ac2684c8e280abf8d7143c887982;p=senf.git diff --git a/Packets/PacketImpl.cc b/Packets/PacketImpl.cc index 5b5e12f..647d37f 100644 --- a/Packets/PacketImpl.cc +++ b/Packets/PacketImpl.cc @@ -47,23 +47,8 @@ prefix_ senf::detail::PacketImpl::~PacketImpl() Annotations::const_iterator const i_end (annotations_.end()); std::vector::iterator small (AnnotationIndexerBase::small().begin()); for (; i != i_end; ++i, ++small) - if (! *small && *i) - delete *i; -} - -// This function has a problem being inlined. Somehow, often when calling this, the size of the -// resulting inlined code would be huge. Need to further debug this. - -prefix_ void senf::detail::PacketImpl::release(refcount_t n) -{ - SENF_ASSERT(refcount_ >= n); - // uah ... we need to be extremely careful here. If refcount_ is n, we want to commit suicide, - // however the destructor will remove all PacketInterpreters from the list and will thereby - // decrement refcount -> only decrenebt refcount_ when *not* caling delete - if (refcount_ == n) - delete this; - else - refcount_ -= n; + if (! *small && i->p) + delete i->p; } // interpreter chain