minor fixes for clang++

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

diff --git a/senf/Packets/VariantParser.hh b/senf/Packets/VariantParser.hh
index 02b65a5..4d667d2 100644 (file)
--- a/senf/Packets/VariantParser.hh
+++ b/senf/Packets/VariantParser.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 VariantParser public header */
@@ -39,7 +44,7 @@
 #include "PacketParser.hh"
 
 //#include "VariantParser.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 
@@ -84,7 +89,7 @@ namespace senf {
 
     public:
         ///\name Parser interface
-        ///\{
+        //\{
 
         VariantParser(data_iterator i, state_type s);
         VariantParser(AuxPolicy policy, data_iterator i, state_type s);
@@ -96,8 +101,8 @@ namespace senf {
             typename boost::mpl::at<parsers, boost::mpl::int_<0> >::type>::value
                 + AuxPolicy::aux_bytes;
 
-        ///\}
-        ///////////////////////////////////////////////////////////////////////////
+        //\}
+        //-////////////////////////////////////////////////////////////////////////
 
         unsigned variant() const;       ///< Get current variant
                                         /**< Get the currently selected variant index. The returned
@@ -255,7 +260,7 @@ namespace senf {
         SENF_PARSER_VARIANT_I(protected, name, chooser, types)
 }
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #endif
 #if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_VariantParser_i_)
 #define HH_SENF_Packets_VariantParser_i_