X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacketData.cci;h=73719c55bee2becbdbeafc2356d7283958fe5b76;hb=bd9f9d3fd6fbcff0112a7bf48ab9284da9576b11;hp=7de154c1ac4803c3ccfedcd6c5f07407fd504c9e;hpb=f73fa16ed5abdce272ac77f8b8b9ef2b9922c266;p=senf.git

diff --git a/Packets/PacketData.cci b/Packets/PacketData.cci
index 7de154c..73719c5 100644
--- a/Packets/PacketData.cci
+++ b/Packets/PacketData.cci
@@ -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
@@ -24,9 +24,10 @@
     \brief PacketData inline non-template implementation */
 
 // Custom includes
+#include "../Utils/senfassert.hh"
 #include <iterator>
 #include "PacketImpl.hh"
-#include "PacketParser.hh"
+// #include "PacketParser.hh"
 
 #define prefix_ inline
 ///////////////////////////////cci.p///////////////////////////////////////
@@ -34,17 +35,24 @@
 ///////////////////////////////////////////////////////////////////////////
 // senf::PacketData
 
+prefix_ senf::detail::PacketImpl & senf::PacketData::impl()
+    const
+{
+    SENF_ASSERT( impl_ );
+    return *impl_;
+}
+
 prefix_ senf::PacketData::iterator senf::PacketData::begin()
     const
 {
-    BOOST_ASSERT(begin_ <= impl().size());
+    SENF_ASSERT(begin_ <= impl().size());
     return boost::next(impl().begin(),begin_);
 }
 
 prefix_ senf::PacketData::iterator senf::PacketData::end()
     const
 {
-    BOOST_ASSERT(end_ <= impl().size());
+    SENF_ASSERT(end_ <= impl().size());
     return boost::next(impl().begin(),end_);
 }
 
@@ -63,13 +71,13 @@ prefix_ bool senf::PacketData::empty()
 prefix_ senf::PacketData::byte senf::PacketData::operator[](size_type n)
     const
 {
-    BOOST_ASSERT( n < size() );
+    SENF_ASSERT( n < size() );
     return *( boost::next(begin(),n) );
 }
 
 prefix_ senf::PacketData::byte & senf::PacketData::operator[](size_type n)
 {
-    BOOST_ASSERT( n < size() );
+    SENF_ASSERT( n < size() );
     return *( boost::next(begin(),n) );
 }
 
@@ -100,121 +108,27 @@ prefix_ void senf::PacketData::clear()
     impl().clear(this);
 }
 
-prefix_ bool senf::PacketData::valid()
-{
-    return impl_;
-}
-
-// protected members
-
-prefix_ senf::PacketData::PacketData(size_type b, size_type e)
-    : impl_(), begin_(b), end_(e)
-{}
-
-prefix_ senf::detail::PacketImpl & senf::PacketData::impl()
-    const
-{
-    BOOST_ASSERT( impl_ );
-    return *impl_;
-}
-
-///////////////////////////////////////////////////////////////////////////
-// senf::safe_data_iterator
-
-prefix_ senf::safe_data_iterator::safe_data_iterator()
-    : data_(0), i_(0)
-{}
-
-prefix_  senf::safe_data_iterator::safe_data_iterator(PacketData & data)
-    : data_(&data), i_(0)
-{}
-
-prefix_ senf::safe_data_iterator::safe_data_iterator(PacketData & data, PacketData::iterator i)
-    : data_(&data), i_(std::distance(data.begin(),i))
-{}
-
-prefix_  senf::safe_data_iterator::safe_data_iterator(PacketParserBase const & parser)
-    : data_(&parser.data()), i_(std::distance(data_->begin(),parser.i()))
-{}
-
-prefix_ senf::safe_data_iterator & senf::safe_data_iterator::operator=(PacketData::iterator i)
-{
-    BOOST_ASSERT(data_);
-    i_ = std::distance(data_->begin(),i);
-    return *this;
-}
-
-prefix_ senf::safe_data_iterator &
-senf::safe_data_iterator::operator=(PacketParserBase const & parser)
-{
-    data_ = &parser.data();
-    i_ = std::distance(data_->begin(),parser.i());
-    return *this;
-}
-
-prefix_ senf::safe_data_iterator::operator senf::PacketData::iterator()
-    const
-{
-    return i();
-}
-
-prefix_ bool senf::safe_data_iterator::boolean_test()
-    const
-{
-    return data_;
-}
-
-prefix_ senf::PacketData & senf::safe_data_iterator::data()
-    const
+prefix_ void senf::PacketData::reserve(size_type n)
 {
-    BOOST_ASSERT(data_);
-    return *data_;
+    impl().reserve(n + size() - impl().size());
 }
 
-prefix_ senf::safe_data_iterator::value_type & senf::safe_data_iterator::dereference()
+prefix_ senf::PacketData::size_type senf::PacketData::capacity()
     const
 {
-    return *i();
+    return impl().capacity() - (impl().size() - size());
 }
 
-prefix_ bool senf::safe_data_iterator::equal(safe_data_iterator const & other)
-    const
-{
-    BOOST_ASSERT(data_ == other.data_);
-    return i_ == other.i_;
-}
-
-prefix_ senf::safe_data_iterator::difference_type
-senf::safe_data_iterator::distance_to(safe_data_iterator const & other)
-    const
-{
-    BOOST_ASSERT(data_ == other.data_);
-    return other.i_ - i_;
-}
-
-prefix_ void senf::safe_data_iterator::increment()
-{
-    ++i_;
-}
-
-prefix_ void senf::safe_data_iterator::decrement()
+prefix_ bool senf::PacketData::valid()
 {
-    BOOST_ASSERT(i_>0);
-    --i_;
+    return impl_;
 }
 
-prefix_ void senf::safe_data_iterator::advance(difference_type n)
-{
-    BOOST_ASSERT( -n < difference_type(i_) );
-    i_ += n;
-}
+// protected members
 
-prefix_ senf::PacketData::iterator senf::safe_data_iterator::i()
-    const
-{
-    BOOST_ASSERT(data_);
-    return boost::next(data_->begin(),i_);
-}
+prefix_ senf::PacketData::PacketData(size_type b, size_type e)
+    : impl_(), begin_(b), end_(e)
+{}
 
 ///////////////////////////////cci.e///////////////////////////////////////
 #undef prefix_