X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FPacketData.cci;h=747c7940663e6a404649cef32169bb82925a8a2f;hb=961cf85a6abf2b5f0a7958bbfcd8f72e7b32721b;hp=73719c55bee2becbdbeafc2356d7283958fe5b76;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Packets/PacketData.cci b/senf/Packets/PacketData.cci
index 73719c5..747c794 100644
--- a/senf/Packets/PacketData.cci
+++ b/senf/Packets/PacketData.cci
@@ -24,7 +24,7 @@
     \brief PacketData inline non-template implementation */
 
 // Custom includes
-#include "../Utils/senfassert.hh"
+#include <senf/Utils/senfassert.hh>
 #include <iterator>
 #include "PacketImpl.hh"
 // #include "PacketParser.hh"
@@ -38,21 +38,25 @@
 prefix_ senf::detail::PacketImpl & senf::PacketData::impl()
     const
 {
-    SENF_ASSERT( impl_ );
+    SENF_ASSERT(
+        impl_,
+        "Internal failure: PacketData (PacketInterpreter) instance not part of any Packet?");
     return *impl_;
 }
 
 prefix_ senf::PacketData::iterator senf::PacketData::begin()
     const
 {
-    SENF_ASSERT(begin_ <= impl().size());
+    SENF_ASSERT(begin_ <= impl().size(),
+                "Internal failure: PacketInterpreter range outside of data container");
     return boost::next(impl().begin(),begin_);
 }
 
 prefix_ senf::PacketData::iterator senf::PacketData::end()
     const
 {
-    SENF_ASSERT(end_ <= impl().size());
+    SENF_ASSERT(end_ <= impl().size(),
+                "Internal failure: PacketInterpreter range outside of data container");
     return boost::next(impl().begin(),end_);
 }
 
@@ -71,13 +75,13 @@ prefix_ bool senf::PacketData::empty()
 prefix_ senf::PacketData::byte senf::PacketData::operator[](size_type n)
     const
 {
-    SENF_ASSERT( n < size() );
+    SENF_ASSERT( n < size(), "Access out of container range" );
     return *( boost::next(begin(),n) );
 }
 
 prefix_ senf::PacketData::byte & senf::PacketData::operator[](size_type n)
 {
-    SENF_ASSERT( n < size() );
+    SENF_ASSERT( n < size(), "Access out of container range" );
     return *( boost::next(begin(),n) );
 }