X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacketImpl.cc;h=5b0ad43ae37df6e16a4c5e1444e44d22beac8cf1;hb=6fecbc9f068fc7c391f5f23d2c7ff37f61f1ff2d;hp=ebf720cdb5f952c7ec78d8f6514e7afb8eb53181;hpb=f73fa16ed5abdce272ac77f8b8b9ef2b9922c266;p=senf.git

diff --git a/Packets/PacketImpl.cc b/Packets/PacketImpl.cc
index ebf720c..5b0ad43 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 <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -34,8 +34,34 @@
 ///////////////////////////////cc.p////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////
+// senf::detail::AnnotationIndexerBase
+
+unsigned senf::detail::AnnotationIndexerBase::maxAnnotations (0);
+
+prefix_ void senf::detail::AnnotationIndexerBase::dump(PacketImpl * p, std::ostream & os)
+{
+    for(std::vector<AnnotationIndexerBase*>::const_iterator 
+            i (registry().begin()), i_end (registry().end());
+        i != i_end; ++i)
+        (*i)->v_dump(p,os);
+}
+
+///////////////////////////////////////////////////////////////////////////
 // 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<bool>::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)