Packets/80211Bundle: Complete radiotap dump (incl. unit-test)

[senf.git] / senf / Packets / ListParser.ct

diff --git a/senf/Packets/ListParser.ct b/senf/Packets/ListParser.ct
index 19fccdb..901d2e0 100644 (file)
--- a/senf/Packets/ListParser.ct
+++ b/senf/Packets/ListParser.ct
@@ -26,7 +26,7 @@
 #include "ListParser.ih"
 
 // Custom includes
-#include "../Utils/senfassert.hh"
+#include <senf/Utils/senfassert.hh>
 
 #define prefix_
 ///////////////////////////////ct.p////////////////////////////////////////
@@ -51,7 +51,7 @@ prefix_ typename senf::ListParser<ListPolicy>::value_type
 senf::ListParser<ListPolicy>::back()
     const
 {
-    SENF_ASSERT( ! empty() );
+    SENF_ASSERT( ! empty(), "back() called on empty list" );
     container c(*this);
     typename container::iterator i (c.begin()), j;
     typename container::iterator const e (c.end());
@@ -67,7 +67,7 @@ prefix_ typename senf::ListParser_Container<ListPolicy>::value_type
 senf::ListParser_Container<ListPolicy>::back()
     const
 {
-    SENF_ASSERT( ! empty() );
+    SENF_ASSERT( ! empty(), "back() called on empty list" );
     iterator i (begin()), j;
     iterator const e (end());
     for (j=i; i!=e; j=i, ++i) ;
@@ -75,7 +75,8 @@ senf::ListParser_Container<ListPolicy>::back()
 }
 
 template <class ListPolicy>
-prefix_ void senf::ListParser_Container<ListPolicy>::shift(iterator pos, size_type n)
+prefix_ typename senf::ListParser_Container<ListPolicy>::value_type
+senf::ListParser_Container<ListPolicy>::shift(iterator pos, size_type n)
 {
     ListPolicy::update(*this);
     safe_data_iterator sp (data(),pos.raw());
@@ -84,6 +85,7 @@ prefix_ void senf::ListParser_Container<ListPolicy>::shift(iterator pos, size_ty
         value_type(sp,state()).init();
         ListPolicy::insert(*this,sp);
     }
+    return value_type(sp,state());
 }
 
 template <class ListPolicy>