+// $Id$
+//
// Copyright (C) 2007
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// 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
\brief PacketImpl inline non-template implementation */
// Custom includes
+#include "../Utils/senfassert.hh"
#include "PacketInterpreter.hh"
#define prefix_ inline
prefix_ void senf::detail::PacketImpl::release(refcount_t n)
{
- BOOST_ASSERT(refcount_ >= n);
+ SENF_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
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);
}
///////////////////////////////////////////////////////////////////////////