switch to new MPL based Fraunhofer FOKUS Public License

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

diff --git a/senf/Packets/SafeIterator.hh b/senf/Packets/SafeIterator.hh
index b0ff4bf..21ba2d7 100644 (file)
--- a/senf/Packets/SafeIterator.hh
+++ b/senf/Packets/SafeIterator.hh
@@ -1,24 +1,29 @@
 // $Id$
 //
-// Copyright (C) 2008 
+// Copyright (C) 2008
 // 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 SafeIterator public header */
@@ -34,7 +39,7 @@
 #include <boost/iterator/iterator_facade.hpp>
 
 //#include "SafeIterator.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 
@@ -59,7 +64,7 @@ namespace senf {
         typedef PacketData::size_type size_type;
 
         safe_data_iterator(); ///< Make uninitialized iterator
-        explicit safe_data_iterator(PacketData & data); 
+        explicit safe_data_iterator(PacketData & data);
                                         ///< Construct iterator only setting the data container
         safe_data_iterator(PacketData & data, PacketData::iterator i);
                                         ///< Initialize iterator to given position
@@ -69,7 +74,7 @@ namespace senf {
                                              position. */
 
         safe_data_iterator & operator=(PacketData::iterator i); ///< Assign iterator
-                                        /**< The iteator \a i must be from the container wo which \c
+                                        /**< The iterator \a i must be from the container which \c
                                              this iterator has been initialized. */
         safe_data_iterator & operator=(PacketParserBase const & parser);
                                         ///< Assign iterator from parser
@@ -122,12 +127,12 @@ namespace senf {
         : public safe_bool< SafePacketParserWrapper<Parser> >
     {
     public:
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         // Types
 
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         ///\name Structors and default members
-        ///@{
+        //\{
 
         // default copy constructor
         // default copy assignment
@@ -139,8 +144,8 @@ namespace senf {
 
         SafePacketParserWrapper & operator=(Parser parser); ///< Assign \a parser to \c this
 
-        ///@}
-        ///////////////////////////////////////////////////////////////////////////
+        //\}
+        //-////////////////////////////////////////////////////////////////////////
 
         Parser & operator*() const;       ///< Access the stored parser
                                         /**< On every access, the stored parsers iterator will be
@@ -159,7 +164,7 @@ namespace senf {
 
 }
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #endif
 #if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_SafeIterator_i_)
 #define HH_SENF_Packets_SafeIterator_i_