X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacketData.cci;h=28ae24c7423e48f0ca3953db22394531289de42f;hb=16d94efc2159cba35fc44e5b26747ae0a2ab237b;hp=9a687cfdcc831fb99a9d523afa28718f4fa8913c;hpb=f13c1275e48e97dceb7de7925793a4c69a5aeb61;p=senf.git

diff --git a/Packets/PacketData.cci b/Packets/PacketData.cci
index 9a687cf..28ae24c 100644
--- a/Packets/PacketData.cci
+++ b/Packets/PacketData.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,6 +24,7 @@
     \brief PacketData inline non-template implementation */
 
 // Custom includes
+#include "../Utils/senfassert.hh"
 #include <iterator>
 #include "PacketImpl.hh"
 #include "PacketParser.hh"
@@ -35,14 +38,14 @@
 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_);
 }
 
@@ -61,13 +64,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) );
 }
 
@@ -112,7 +115,7 @@ prefix_ senf::PacketData::PacketData(size_type b, size_type e)
 prefix_ senf::detail::PacketImpl & senf::PacketData::impl()
     const
 {
-    BOOST_ASSERT( impl_ );
+    SENF_ASSERT( impl_ );
     return *impl_;
 }
 
@@ -137,7 +140,7 @@ prefix_  senf::safe_data_iterator::safe_data_iterator(PacketParserBase const & p
 
 prefix_ senf::safe_data_iterator & senf::safe_data_iterator::operator=(PacketData::iterator i)
 {
-    BOOST_ASSERT(data_);
+    SENF_ASSERT(data_);
     i_ = std::distance(data_->begin(),i);
     return *this;
 }
@@ -165,7 +168,7 @@ prefix_ bool senf::safe_data_iterator::boolean_test()
 prefix_ senf::PacketData & senf::safe_data_iterator::data()
     const
 {
-    BOOST_ASSERT(data_);
+    SENF_ASSERT(data_);
     return *data_;
 }
 
@@ -178,7 +181,7 @@ prefix_ senf::safe_data_iterator::value_type & senf::safe_data_iterator::derefer
 prefix_ bool senf::safe_data_iterator::equal(safe_data_iterator const & other)
     const
 {
-    BOOST_ASSERT(data_ == other.data_);
+    SENF_ASSERT(data_ == other.data_);
     return i_ == other.i_;
 }
 
@@ -186,7 +189,7 @@ prefix_ senf::safe_data_iterator::difference_type
 senf::safe_data_iterator::distance_to(safe_data_iterator const & other)
     const
 {
-    BOOST_ASSERT(data_ == other.data_);
+    SENF_ASSERT(data_ == other.data_);
     return other.i_ - i_;
 }
 
@@ -197,20 +200,20 @@ prefix_ void senf::safe_data_iterator::increment()
 
 prefix_ void senf::safe_data_iterator::decrement()
 {
-    BOOST_ASSERT(i_>0);
+    SENF_ASSERT(i_>0);
     --i_;
 }
 
 prefix_ void senf::safe_data_iterator::advance(difference_type n)
 {
-    BOOST_ASSERT( -n < difference_type(i_) );
+    SENF_ASSERT( -n < difference_type(i_) );
     i_ += n;
 }
 
 prefix_ senf::PacketData::iterator senf::safe_data_iterator::i()
     const
 {
-    BOOST_ASSERT(data_);
+    SENF_ASSERT(data_);
     return boost::next(data_->begin(),i_);
 }