switch to new MPL based Fraunhofer FOKUS Public License

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

diff --git a/senf/Packets/PacketParser.ih b/senf/Packets/PacketParser.ih
index a44fe83..6b18c24 100644 (file)
--- a/senf/Packets/PacketParser.ih
+++ b/senf/Packets/PacketParser.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 PacketParser internal header */
@@ -29,7 +34,7 @@
 // Custom includes
 #include <senf/Utils/mpl.hh>
 
-///////////////////////////////ih.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace detail {
@@ -38,12 +43,12 @@ namespace detail {
 
 #   ifndef DOXYGEN
 
-    // Use SFINAE to check, if Parser has an integer-valued fixed_bytes member. If not,
-    // 'Parser_TakeNum<Parser::fixed_bytes>' fails and the overload is removed from the overload
-    // set. 
+    // Use SFINAE to check, if Parser has an integer-valued init_bytes member. If not,
+    // 'Parser_TakeNum<Parser::init_bytes>' fails and the overload is removed from the overload
+    // set.
     template <class Parser>
     PacketParserBase::size_type packetParserSize(
-        Parser p, int, senf::mpl::take_uint<Parser::fixed_bytes> * = 0);
+        Parser p, int, senf::mpl::take_uint<Parser::init_bytes> * = 0);
 
     // An ellipsis is always the worst match. A call 'packetParserSize(p,0) will prefer above
     // overload if that is not disabled by SFINAE.
@@ -61,7 +66,7 @@ namespace detail {
     // This version of ParserInitBytes_Choose uses 'Parser::init_bytes' to provide 'value' (via
     // 'boost::integral_constant')
     template <class Parser, unsigned _>
-    struct ParserInitBytes_Choose 
+    struct ParserInitBytes_Choose
         : public boost::integral_constant<PacketParserBase::size_type, Parser::init_bytes> {};
     // ^^-- g++ error signaled here:
     //    error: 'fixed_bytes' is not a member of 'some-class-name'
@@ -72,7 +77,7 @@ namespace detail {
     // Either 'some-class-name' is not the class you wanted to use (it really is no parser) or you
     // left out either 'init_bytes' or 'fixed_bytes' when defining the parser. This will also
     // happen, if you forget to call 'SENF_PARSER_FINALIZE()' when defining a composite parser.
-    ///////////////////////////////////////////////////////////////////////////////////////////////
+    //-/////////////////////////////////////////////////////////////////////////////////////////////
 
     // If Parser::init_bytes is not defined, this specialization is chosen which instead uses
     // 'Parser::fixed_bytes'
@@ -100,7 +105,7 @@ namespace detail {
 
 }}
 
-///////////////////////////////ih.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #endif
 
 \f