switch to new MPL based Fraunhofer FOKUS Public License

[senf.git] / senf / Utils / Logger / Parameters.ih

diff --git a/senf/Utils/Logger/Parameters.ih b/senf/Utils/Logger/Parameters.ih
index 4941b79..7c16f3d 100644 (file)
--- a/senf/Utils/Logger/Parameters.ih
+++ b/senf/Utils/Logger/Parameters.ih
@@ -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 Parameters internal header */
@@ -36,15 +41,15 @@
 #include <boost/mpl/if.hpp>
 #include <boost/utility.hpp>
 #include <boost/type_traits/is_convertible.hpp>
-#include "../mpl.hh"
+#include <senf/Utils/mpl.hh>
 #include "Config.hh"
 #include "Target.hh"
 
-///////////////////////////////ih.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace log {
-    
+
     class DefaultArea;
     class Debug;
     class NONE;
@@ -84,7 +89,7 @@ namespace detail {
 
     senf::mpl::rv<5> Parameters_select_(AliasBase *);
     template <class Base, class Param>
-    struct Parameters_<Base,Param,5> 
+    struct Parameters_<Base,Param,5>
         : public Param::template apply<Base>::type
     {};
 
@@ -92,7 +97,7 @@ namespace detail {
     // this name is created by SENF_LOG_CLASS_AREA()
     template <class T>
     senf::mpl::rv<6> Parameters_select_(
-        T *, 
+        T *,
         typename boost::disable_if< boost::is_convertible<T*,StreamBase*> >::type * = 0,
         typename boost::disable_if< boost::is_convertible<T*,AreaBase*> >::type * = 0,
         typename boost::disable_if< boost::is_convertible<T*,LevelBase*> >::type * = 0,
@@ -107,16 +112,16 @@ namespace detail {
     template <class Base>
     struct Parameters : public Base
     {
-        typedef typename boost::mpl::if_c< Base::level::value == NONE::value, 
-                                           typename Base::stream::defaultLevel, 
+        typedef typename boost::mpl::if_c< Base::level::value == NONE::value,
+                                           typename Base::stream::defaultLevel,
                                            typename Base::level >::type level;
 
         static bool const compileEnabled = senf::log::Enabled<
-            typename Base::stream, 
-            typename Base::area_base, 
+            typename Base::stream,
+            typename Base::area_base,
             level>::value;
 
-        static bool enabled() { 
+        static bool enabled() {
             return compileEnabled
                 && ( senf::log::detail::TargetRegistry::instance().fallbackRouting() ||
                      Base::area::instance().limit(Base::stream::instance()) <= level::value );
@@ -133,8 +138,8 @@ namespace detail {
         template <class Base, class Param>
         struct apply {
             typedef Parameters_<
-                Base, 
-                Param, 
+                Base,
+                Param,
                 SENF_MPL_RV(Parameters_select_(static_cast<Param*>(0)))> type;
         };
     };
@@ -163,7 +168,7 @@ typedef senf::log::NONE        SENFLogDefaultLevel;
         senf::log::detail::empty,                                                                 \
         (SENFLogDefaultStream)(SENFLogDefaultArea)(SENFLogDefaultLevel)args) >
 
-///////////////////////////////ih.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #endif
 
 \f