X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacketImpl.cc;h=647d37f143a2634f2aed1ab976eef08cc2068eaf;hb=5443435c4c2b6e4386c5334b5b8358273f2bae93;hp=ebf720cdb5f952c7ec78d8f6514e7afb8eb53181;hpb=f73fa16ed5abdce272ac77f8b8b9ef2b9922c266;p=senf.git diff --git a/Packets/PacketImpl.cc b/Packets/PacketImpl.cc index ebf720c..647d37f 100644 --- a/Packets/PacketImpl.cc +++ b/Packets/PacketImpl.cc @@ -1,8 +1,8 @@ // $Id$ // -// Copyright (C) 2007 -// Fraunhofer Institute for Open Communication Systems (FOKUS) -// Competence Center NETwork research (NET), St. Augustin, GERMANY +// Copyright (C) 2007 +// Fraunhofer Institute for Open Communication Systems (FOKUS) +// Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Bund // // This program is free software; you can redistribute it and/or modify @@ -33,9 +33,24 @@ #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; +} + // interpreter chain prefix_ void senf::detail::PacketImpl::appendInterpreter(PacketInterpreterBase * p)