switch to new MPL based Fraunhofer FOKUS Public License

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

diff --git a/senf/Packets/SafeIterator.cti b/senf/Packets/SafeIterator.cti
index a798945..5abcd77 100644 (file)
--- a/senf/Packets/SafeIterator.cti
+++ b/senf/Packets/SafeIterator.cti
@@ -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 inline template implementation */
@@ -28,9 +33,9 @@
 // Custom includes
 
 #define prefix_ inline
-///////////////////////////////cti.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::SafePacketParserWrapper<Parser>
 
 template <class Parser>
@@ -55,7 +60,7 @@ template <class Parser>
 prefix_ Parser & senf::SafePacketParserWrapper<Parser>::operator*()
     const
 {
-    SENF_ASSERT( i_ );
+    SENF_ASSERT( i_, "Dereferencing empty SafePacketParserWrapper" );
     parser_->i_ = PacketParserBase::data_iterator(i_);
     return *parser_;
 }
@@ -64,7 +69,7 @@ template <class Parser>
 prefix_ Parser * senf::SafePacketParserWrapper<Parser>::operator->()
     const
 {
-    SENF_ASSERT( i_ );
+    SENF_ASSERT( i_, "Dereferencing empty SafePacketParserWrapper" );
     parser_->i_ = PacketParserBase::data_iterator(i_);
     return & (*parser_);
 }
@@ -76,7 +81,7 @@ prefix_ bool senf::SafePacketParserWrapper<Parser>::boolean_test()
     return i_;
 }
 
-///////////////////////////////cti.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 
 \f