switch to new MPL based Fraunhofer FOKUS Public License

[senf.git] / senf / Utils / Logger / Log.hh

diff --git a/senf/Utils/Logger/Log.hh b/senf/Utils/Logger/Log.hh
index da88f1d..c6e88b3 100644 (file)
--- a/senf/Utils/Logger/Log.hh
+++ b/senf/Utils/Logger/Log.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 Log public header */
@@ -35,26 +40,26 @@
 
 //#include "Log.mpp"
 #include "Log.ih"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 /** \defgroup logging Logging commands
 
     The logging library provides several commands to create %log messages. All these macro commands
     take a variable number of arguments. Since this is not supported in a usable way by the C++
     preprocessor, the arguments are encoded into a <a
-    href="http://www.boost.org/libs/preprocessor/doc/index.html">Boost.Preprocessor</a> like
-    sequence:
+    href="http://www.boost.org/doc/libs/release/libs/preprocessor/doc/index.html">Boost.Preprocessor</a>
+    like sequence:
 
     \code
     SENF_LOG( (senf::log::Debug)(senf::log::NOTICE)(FroblizerArea)("The log message") );
     \endcode
 
-    The argument is comprised of a sequence of parameters and the %log message itself. 
+    The argument is comprised of a sequence of parameters and the %log message itself.
     The parameters are
     - the <em>%log stream</em>,
     - the <em>%log area</em>,
     - the <em>%log level</em>.
-    
+
     These parameters are optional and may be specified <i>in arbitrary order</i> (with the %log
     message always being the last sequence element) and even multiple times in the parameter
     sequence. If some argument type occurs multiple times, the last occurrence wins. If any one of
@@ -71,7 +76,7 @@
 
     The %log level senf::log::NONE is special. If the %log level is set to this value, the %log level
     will be set from the stream provided default value.
-    
+
     All these parameters must be <em>compile time constants</em> (they are all types, so it's
     difficult for them to be something else).
 
@@ -93,10 +98,10 @@
  */
 
 ///\addtogroup logging
-///\{
+//\{
 
 ///\name Generating log messages
-///\{
+//\{
 
 /** \brief Write log message
 
@@ -150,10 +155,10 @@
     SENF_LOG_BLOCK_TPL_( SENF_LOG_MERGE_PARAMETERS_TPL(BOOST_PP_SEQ_POP_BACK(args)),              \
                          BOOST_PP_SEQ_ELEM(BOOST_PP_DEC(BOOST_PP_SEQ_SIZE(args)),args))
 
-///\}
-///\}
+//\}
+//\}
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 //#include "Log.cci"
 //#include "Log.ct"
 //#include "Log.cti"