X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FListParser.ct;h=1ba2d8b5857aba133dc85e1d7edc6576a7a4b8e1;hb=ddb2132be4265f8a0d7d4c954c7c9401e59d027c;hp=19fccdbc3abf1ebde37e980e50cf9927e746d41a;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Packets/ListParser.ct b/senf/Packets/ListParser.ct
index 19fccdb..1ba2d8b 100644
--- a/senf/Packets/ListParser.ct
+++ b/senf/Packets/ListParser.ct
@@ -2,23 +2,28 @@
 //
 // 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
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief ListParser non-inline template implementation  */
@@ -26,12 +31,12 @@
 #include "ListParser.ih"
 
 // Custom includes
-#include "../Utils/senfassert.hh"
+#include <senf/Utils/senfassert.hh>
 
 #define prefix_
-///////////////////////////////ct.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ListParser<ElementParser,ListPolicy>
 
 template <class ListPolicy>
@@ -42,7 +47,7 @@ prefix_ void senf::ListParser<ListPolicy>::init()
     container c (*this);
     typename container::iterator i (c.begin());
     typename container::iterator const e (c.end());
-    for(; i!=e; ++i)
+    for (; i!=e; ++i)
         i->init();
 }
 
@@ -51,7 +56,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());
@@ -59,7 +64,7 @@ senf::ListParser<ListPolicy>::back()
     return *j;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ListParser_Container<ListPolicy>
 
 template <class ListPolicy>
@@ -67,7 +72,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 +80,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 +90,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>
@@ -173,7 +180,7 @@ prefix_ void senf::ListParser_Container<ListPolicy>::resize(size_type n,
         push_back(value,n-sz);
 }
 
-///////////////////////////////ct.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_