X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacketImpl.cci;h=40489bf3888b554f49b2706a1dbce4f6945b9f33;hb=10985d71f77b627bc4da543d7114feb7c4529329;hp=d8dd2cb0744c8bcaaff1ace676521ad0027142c3;hpb=47368f306a577d1e46df69a7f729bd3893cbe5e7;p=senf.git

diff --git a/Packets/PacketImpl.cci b/Packets/PacketImpl.cci
index d8dd2cb..40489bf 100644
--- a/Packets/PacketImpl.cci
+++ b/Packets/PacketImpl.cci
@@ -1,6 +1,8 @@
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// $Id$
+//
+// 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
@@ -22,13 +24,14 @@
     \brief PacketImpl inline non-template implementation */
 
 // Custom includes
-#include "PacketInterpreter.hh"
+#include "../Utils/senfassert.hh"
+// #include "PacketInterpreter.hh"
 
 #define prefix_ inline
 ///////////////////////////////cci.p///////////////////////////////////////
 
 // Memory management:
-// 
+//
 // * The PacketImpl destructor will *explicitly* clean-up the interpreters_ list by removing
 //   each element from the list and deleting it if it's (intrusive) refcount is 0
 // * The PacketInterpreters use safe hooks -> they know wether they are part of a list or not
@@ -75,18 +78,6 @@ prefix_ void senf::detail::PacketImpl::add_ref(refcount_t n)
     refcount_ += n;
 }
 
-prefix_ void senf::detail::PacketImpl::release(refcount_t n)
-{
-    BOOST_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;
-}
-
 prefix_ senf::detail::PacketImpl::refcount_t senf::detail::PacketImpl::refcount()
     const
 {
@@ -112,7 +103,7 @@ prefix_ senf::PacketInterpreterBase * senf::detail::PacketImpl::next(PacketInter
 }
 
 prefix_ senf::PacketInterpreterBase * senf::detail::PacketImpl::prev(PacketInterpreterBase * p)
-{ 
+{
     interpreter_list::iterator i (interpreter_list::current(*p));
     return (i == interpreters_.begin()) ? 0 : &*(--i);
 }
@@ -148,27 +139,32 @@ prefix_ senf::detail::PacketImpl::size_type senf::detail::PacketImpl::size()
 
 prefix_ void senf::detail::PacketImpl::insert(PacketData * self, iterator pos, byte v)
 {
+    difference_type ix (std::distance(begin(),pos));
     data_.insert(pos,v);
-    updateIterators(self,pos,1);
+    updateIterators(self,ix,1);
 }
 
 prefix_ void senf::detail::PacketImpl::insert(PacketData * self, iterator pos, size_type n,
                                               byte v)
 {
+    difference_type ix (std::distance(begin(),pos));
     data_.insert(pos,n,v);
-    updateIterators(self,pos,n);
+    updateIterators(self,ix,n);
 }
 
 prefix_ void senf::detail::PacketImpl::erase(PacketData * self, iterator pos)
 {
+    difference_type ix (std::distance(begin(),pos));
     data_.erase(pos);
-    updateIterators(self,pos,-1);
+    updateIterators(self,ix,-1);
 }
 
 prefix_ void senf::detail::PacketImpl::erase(PacketData * self, iterator first, iterator last)
 {
+    difference_type ix (std::distance(begin(),first));
+    difference_type delta (std::distance(first,last));
     data_.erase(first,last);
-    updateIterators(self,first,-std::distance(first,last));
+    updateIterators(self,ix,-delta);
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -195,4 +191,6 @@ prefix_ senf::detail::PacketImpl::Guard::~Guard()
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End: