minor fixes for clang++

[senf.git] / senf / Utils / mpl.hh

diff --git a/senf/Utils/mpl.hh b/senf/Utils/mpl.hh
index fb1b566..a50aa69 100644 (file)
--- a/senf/Utils/mpl.hh
+++ b/senf/Utils/mpl.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 mpl public header */
@@ -27,11 +32,11 @@
 #define HH_SENF_Utils_mpl_ 1
 
 // Custom includes
-#include "../config.hh"
+#include <senf/config.hh>
 
 //#include "mpl.mpp"
 #include "mpl.ih"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace mpl {
@@ -42,8 +47,8 @@ namespace mpl {
     /** \brief Marker class for empty default values etc.
 
         This is like Boosts \c boost::mpl::na just an empty class used as template default argument
-        to mark missing arguments 
-        
+        to mark missing arguments
+
         \note Don't use this as an empty base class. We may add some informative members to this.
         \ingroup senfmpl
      */
@@ -113,14 +118,14 @@ namespace mpl {
         \ingroup senfmpl
      */
     template <unsigned n>
-    struct rv { 
-        char _[SENF_MPL_RV_ALIGNMENT][n+1]; 
+    struct rv {
+        char _[SENF_MPL_RV_ALIGNMENT][n+1];
     };
 
     /** \brief Get return value of overload selector
-        
+
         Used together with senf::mpl::rv to implement overload selection.
-        
+
         \see \ref senf::mpl::rv
         \ingroup senfmpl
         \hideinitializer
@@ -128,7 +133,7 @@ namespace mpl {
 #   define SENF_MPL_RV(expr) (sizeof(expr)/SENF_MPL_RV_ALIGNMENT-1)
 
     /** \brief Take an arbitrary unsigned integer template argument
-        
+
         Used together with <a href="http://en.wikipedia.org/wiki/SFINAE">SFINAE</a>: The expression
         <tt>take_uint<</tt> \a expr <tt>></tt> is only valid if \a expr is valid and returns a value
         convertible to an unsigned integer.
@@ -138,7 +143,7 @@ namespace mpl {
     template <unsigned long _> struct take_uint {};
 
     /** \brief Take an arbitrary integer template argument
-        
+
         Used together with <a href="http://en.wikipedia.org/wiki/SFINAE">SFINAE</a>: The expression
         <tt>take_int<</tt> \a expr <tt>></tt> is only valid if \a expr is valid and returns a value
         convertible to an integer.
@@ -148,7 +153,7 @@ namespace mpl {
     template <long _> struct take_int {};
 
     /** \brief Take an arbitrary type template argument
-        
+
         Used together with <a href="http://en.wikipedia.org/wiki/SFINAE">SFINAE</a>: The expression
         <tt>take_class<</tt> \a expr <tt>></tt> is only valid if \a expr is valid and is a type.
 
@@ -226,7 +231,7 @@ namespace mpl {
 
 }}
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 //#include "mpl.cci"
 //#include "mpl.ct"
 //#include "mpl.cti"