X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacketImpl.cc;h=f3e9f7c94b3f4e7475da7072c5f66a2e375318a8;hb=6116cb96ea7bdcb42b7d12165a05fcbe0687226d;hp=8dfd75e10c653b5a1a5ffde744aa4463df23bee6;hpb=2d6585ff852e9d282c17003ba1db0b73eb3a8500;p=senf.git diff --git a/Packets/PacketImpl.cc b/Packets/PacketImpl.cc index 8dfd75e..f3e9f7c 100644 --- a/Packets/PacketImpl.cc +++ b/Packets/PacketImpl.cc @@ -1,3 +1,5 @@ +// $Id$ +// // Copyright (C) 2007 // Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS) // Kompetenzzentrum fuer Satelitenkommunikation (SatCom) @@ -57,7 +59,7 @@ prefix_ void senf::detail::PacketImpl::clear(PacketData * self) truncateInterpreters(n); iterator first (boost::next(begin(),self->begin_)); data_.erase(first, boost::next(begin(),self->end_)); - updateIterators(self,first,-self->size()); + updateIterators(self,self->begin_,-self->size()); } // private members @@ -73,7 +75,7 @@ prefix_ void senf::detail::PacketImpl::eraseInterpreters(interpreter_list::itera } } -prefix_ void senf::detail::PacketImpl::updateIterators(PacketData * self, iterator pos, +prefix_ void senf::detail::PacketImpl::updateIterators(PacketData * self, difference_type pos, difference_type n) { // I hate to change the PacketData representation from here, I would have preferred to let @@ -101,7 +103,7 @@ prefix_ void senf::detail::PacketImpl::updateIterators(PacketData * self, iterat // c) interpreter_list::iterator const i_end (interpreters_.end()); if (++i != i_end) - if (std::distance(begin(), pos) < difference_type(i->begin_)) + if (pos <= difference_type(i->begin_)) // pos is before the packet, it must then be before all futher packets ... for (; i != i_end; ++i) { i->begin_ += n;