X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacketImpl.cc;h=647d37f143a2634f2aed1ab976eef08cc2068eaf;hb=fd3a0e8ac95d1158e9ea661ddf9187b67c70169f;hp=f3e9f7c94b3f4e7475da7072c5f66a2e375318a8;hpb=6116cb96ea7bdcb42b7d12165a05fcbe0687226d;p=senf.git diff --git a/Packets/PacketImpl.cc b/Packets/PacketImpl.cc index f3e9f7c..647d37f 100644 --- a/Packets/PacketImpl.cc +++ b/Packets/PacketImpl.cc @@ -1,8 +1,8 @@ // $Id$ // -// Copyright (C) 2007 -// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS) -// Kompetenzzentrum fuer Satelitenkommunikation (SatCom) +// 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)