switch to new MPL based Fraunhofer FOKUS Public License

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

diff --git a/senf/Packets/VariantParser.cti b/senf/Packets/VariantParser.cti
index d694cf6..fc6e694 100644 (file)
--- a/senf/Packets/VariantParser.cti
+++ b/senf/Packets/VariantParser.cti
@@ -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 VariantParser inline template implementation */
@@ -26,13 +31,13 @@
 #include "VariantParser.ih"
 
 // Custom includes
-#include "../Utils/senfassert.hh"
+#include <senf/Utils/senfassert.hh>
 #include <boost/mpl/size.hpp>
 
 #define prefix_ inline
-///////////////////////////////cti.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::VariantParser<AuxPolicy,Parsers>
 
 template <class AuxPolicy, class Parsers>
@@ -74,17 +79,17 @@ prefix_ unsigned senf::VariantParser<AuxPolicy,Parsers>::variant()
 template <class AuxPolicy, class Parsers>
 template <unsigned N>
 prefix_ typename boost::mpl::at<
-    typename senf::VariantParser<AuxPolicy,Parsers>::parsers, 
+    typename senf::VariantParser<AuxPolicy,Parsers>::parsers,
     boost::mpl::int_<N> >::type
 senf::VariantParser<AuxPolicy,Parsers>::get()
     const
 {
-    SENF_ASSERT( variant() == N );
+    SENF_ASSERT( variant() == N, "Access to non-active variant member" );
     return typename boost::mpl::at<parsers, boost::mpl::int_<N> >::type(
         AuxPolicy::adjust(i(), state()), state() );
 }
 
-/////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::detail::VariantBytes<Variant,N>
 
 template <class Variant, unsigned N>
@@ -104,7 +109,7 @@ senf::detail::VariantBytes<Variant,0>::bytes(Variant const & v, unsigned n)
     return senf::bytes(v.template get<0>());
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::detail::VariantKeyTransform<T,Keys>
 
 template <class T, class Keys>
@@ -152,7 +157,7 @@ prefix_ In senf::detail::VariantKeyTransformCheck<In, Out, Keys, 0>::set(Out v)
     return boost::mpl::at<Keys, boost::mpl::int_<0> >::type::key();
 }
 
-///////////////////////////////cti.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 
 \f