X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FSafeIterator.cci;h=09ed3044f95ab895379ccabc27fc654f24ea90d3;hb=e3179a2123ad51d0d9eb63834a581145c4f77c92;hp=b703edea171178eebe0a6ac0b7b6f9ddf08add36;hpb=9cb871b939efe93e35dd96808d25089399acfc46;p=senf.git

diff --git a/senf/Packets/SafeIterator.cci b/senf/Packets/SafeIterator.cci
index b703ede..09ed304 100644
--- a/senf/Packets/SafeIterator.cci
+++ b/senf/Packets/SafeIterator.cci
@@ -28,9 +28,9 @@
 // Custom includes
 
 #define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::safe_data_iterator
 
 prefix_ senf::safe_data_iterator::safe_data_iterator()
@@ -52,13 +52,13 @@ prefix_  senf::safe_data_iterator::safe_data_iterator(PacketParserBase const & p
 prefix_ senf::PacketData::iterator senf::safe_data_iterator::i()
     const
 {
-    SENF_ASSERT(data_);
+    SENF_ASSERT(data_, "Use/dereferencing of empty safe_data_iterator");
     return boost::next(data_->begin(),i_);
 }
 
 prefix_ senf::safe_data_iterator & senf::safe_data_iterator::operator=(PacketData::iterator i)
 {
-    SENF_ASSERT(data_);
+    SENF_ASSERT(data_, "Use/dereferencing of empty safe_data_iterator");
     i_ = std::distance(data_->begin(),i);
     return *this;
 }
@@ -86,7 +86,7 @@ prefix_ bool senf::safe_data_iterator::boolean_test()
 prefix_ senf::PacketData & senf::safe_data_iterator::data()
     const
 {
-    SENF_ASSERT(data_);
+    SENF_ASSERT(data_, "Use/dereferencing of empty safe_data_iterator");
     return *data_;
 }
 
@@ -99,7 +99,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
 {
-    SENF_ASSERT(data_ == other.data_);
+    SENF_ASSERT(data_ == other.data_, "Comparing iterators of two different containers is invalid");
     return i_ == other.i_;
 }
 
@@ -107,7 +107,7 @@ prefix_ senf::safe_data_iterator::difference_type
 senf::safe_data_iterator::distance_to(safe_data_iterator const & other)
     const
 {
-    SENF_ASSERT(data_ == other.data_);
+    SENF_ASSERT(data_ == other.data_, "Comparing iterators of two different containers is invalid");
     return other.i_ - i_;
 }
 
@@ -118,17 +118,17 @@ prefix_ void senf::safe_data_iterator::increment()
 
 prefix_ void senf::safe_data_iterator::decrement()
 {
-    SENF_ASSERT(i_>0);
+    SENF_ASSERT(i_>0, "Decrementing iterator before beginning of container" );
     --i_;
 }
 
 prefix_ void senf::safe_data_iterator::advance(difference_type n)
 {
-    SENF_ASSERT( -n < difference_type(i_) );
+    SENF_ASSERT( -n < difference_type(i_), "Moving iterator to before beginning of container" );
     i_ += n;
 }
 
-///////////////////////////////cci.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_