switch to new MPL based Fraunhofer FOKUS Public License

[senf.git] / senf / Packets / PacketTypes.hh

diff --git a/senf/Packets/PacketTypes.hh b/senf/Packets/PacketTypes.hh
index 87c6df4..1d6c16b 100644 (file)
--- a/senf/Packets/PacketTypes.hh
+++ b/senf/Packets/PacketTypes.hh
@@ -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 PacketTypes public header */
@@ -30,11 +35,11 @@
 #include <vector>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/cstdint.hpp>
-#include <boost/intrusive/ilist.hpp>
-#include <boost/intrusive/ilist_hook.hpp>
+#include <senf/boost_intrusive/ilist.hpp>
+#include <senf/boost_intrusive/ilist_hook.hpp>
 
 //#include "PacketTypes.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 
@@ -55,7 +60,7 @@ namespace packet {
     struct smart_pointer {
         typedef boost::intrusive_ptr<T> ptr_t;
     };
-    
+
     struct interpreter_list_tag;
     typedef boost::intrusive::ilist_base_hook<interpreter_list_tag> interpreter_list_base;
     typedef interpreter_list_base::value_traits<PacketInterpreterBase> interpreter_list_type;
@@ -66,7 +71,7 @@ namespace packet {
     typedef std::vector<byte> raw_container;
     typedef raw_container::size_type size_type;
     typedef raw_container::difference_type difference_type;
-    
+
     typedef raw_container::iterator iterator;
     typedef raw_container::const_iterator const_iterator;
     typedef long refcount_t; // This is long since boost uses long for refcounts .. hmm ..
@@ -77,7 +82,7 @@ namespace test {
 
 }}}}
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #endif
 #if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_PacketTypes_i_)
 #define HH_SENF_Packets_PacketTypes_i_