X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacketImpl.cc;h=f6d06ae65e7cfb2928980b1e924fbfaa518f7a58;hb=88e40575145f8b557b6a1337fa2ce6723be4c43b;hp=2bd41bea6db88ddc02216d5ac646f83d693ff203;hpb=10985d71f77b627bc4da543d7114feb7c4529329;p=senf.git diff --git a/Packets/PacketImpl.cc b/Packets/PacketImpl.cc index 2bd41be..f6d06ae 100644 --- a/Packets/PacketImpl.cc +++ b/Packets/PacketImpl.cc @@ -33,11 +33,26 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// +unsigned senf::detail::AnnotationIndexerBase::maxAnnotations (0); + /////////////////////////////////////////////////////////////////////////// // senf::detail::PacketImpl +prefix_ senf::detail::PacketImpl::~PacketImpl() +{ + // We increment refcount_ to ensure, release() won't call delete again + ++refcount_; + eraseInterpreters(interpreters_.begin(), interpreters_.end()); + Annotations::const_iterator i (annotations_.begin()); + Annotations::const_iterator const i_end (annotations_.end()); + std::vector::iterator small (AnnotationIndexerBase::small().begin()); + for (; i != i_end; ++i, ++small) + if (! *small && i->p) + delete i->p; +} + // 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. +// resulting inlined code would be huge. Need to further debug this. (Disabled inliningfor now) prefix_ void senf::detail::PacketImpl::release(refcount_t n) {