switch to new MPL based Fraunhofer FOKUS Public License

[senf.git] / senf / Packets / ListNParser.ih

diff --git a/senf/Packets/ListNParser.ih b/senf/Packets/ListNParser.ih
index f50bbfd..70ef37b 100644 (file)
--- a/senf/Packets/ListNParser.ih
+++ b/senf/Packets/ListNParser.ih
@@ -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 ListNParser internal header */
@@ -29,35 +34,40 @@
 // Custom includes
 #include "ListParser.ih"
 
-///////////////////////////////ih.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace detail {
 
     /** \brief Internal: ListPolicy defining the ListNParser parser
         \internal
-        \see \ref ListNParser
+        \see \ref ListParser
      */
     template <class ElementParser, class AuxPolicy>
     struct ListNParser_Policy
         : public AuxPolicy
     {
+        typedef ListNParser_Policy<
+            ElementParser, typename AuxPolicy::ParserPolicy> parser_policy;
+        typedef ListNParser_Policy<
+            ElementParser, typename AuxPolicy::WrapperPolicy> container_policy;
         typedef PacketParserBase::data_iterator data_iterator;
         typedef PacketParserBase::state_type state_type;
         typedef PacketParserBase::size_type size_type;
         typedef ElementParser element_type;
-        typedef ListParser< ListNParser_Policy > parser_type;
-        typedef ListParser_Container< ListNParser_Policy > container_type;
+        typedef ListParser<parser_policy> parser_type;
+        typedef ListParser_Container<container_policy> container_type;
 
         static const size_type init_bytes = AuxPolicy::aux_bytes;
 
         ListNParser_Policy();
         template <class Arg> ListNParser_Policy(Arg const & aux);
+        ListNParser_Policy(parser_policy const & policy);
 
         size_type bytes  (data_iterator i, state_type s) const;
         size_type size   (data_iterator i, state_type s) const;
         void      init   (data_iterator i, state_type s) const;
-        
+
         void      construct (container_type & c) const;
         void      destruct  (container_type & c) const;
         void      erase     (container_type & c, data_iterator p) const;
@@ -85,8 +95,8 @@ namespace detail {
     };
 
     template <class ElementParser, class AuxPolicy, class Transform>
-    struct ListParserPolicy<ElementParser, AuxPolicy, 
-                            senf::detail::auxtag::transform<Transform, 
+    struct ListParserPolicy<ElementParser, AuxPolicy,
+                            senf::detail::auxtag::transform<Transform,
                                                             senf::detail::auxtag::none> >
     {
         typedef ListNParser_Policy< ElementParser,
@@ -97,7 +107,7 @@ namespace detail {
 
 }}
 
-///////////////////////////////ih.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #endif
 
 \f