// $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
\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///////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// 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_);
}
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) );
}
: 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
-{
- BOOST_ASSERT(data_);
- return *data_;
-}
-
-prefix_ senf::safe_data_iterator::value_type & senf::safe_data_iterator::dereference()
- const
-{
- return *i();
-}
-
-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()
-{
- BOOST_ASSERT(i_>0);
- --i_;
-}
-
-prefix_ void senf::safe_data_iterator::advance(difference_type n)
-{
- BOOST_ASSERT( -n < difference_type(i_) );
- i_ += n;
-}
-
-prefix_ senf::PacketData::iterator senf::safe_data_iterator::i()
- const
-{
- BOOST_ASSERT(data_);
- return boost::next(data_->begin(),i_);
-}
-
///////////////////////////////cci.e///////////////////////////////////////
#undef prefix_