X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FLogger%2FTarget.ih;h=f7feb4e932e0ecc53efb612d36ed37a2be54de35;hb=HEAD;hp=324baff560d2ad140767dbd04e924ccd3e502664;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git

diff --git a/senf/Utils/Logger/Target.ih b/senf/Utils/Logger/Target.ih
index 324baff..f7feb4e 100644
--- a/senf/Utils/Logger/Target.ih
+++ b/senf/Utils/Logger/Target.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 Target internal header */
@@ -27,14 +32,17 @@
 #define IH_SENF_Utils_Logger_Target_ 1
 
 // Custom includes
+#include <set>
 #include <memory>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/static_assert.hpp>
 #include <boost/shared_ptr.hpp>
+#include <senf/Utils/singleton.hh>
+#include <senf/Utils/mpl.hh>
 #include <senf/Utils/Console/LazyDirectory.hh>
 #include <senf/Utils/Console/Parse.hh>
 
-///////////////////////////////ih.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 
@@ -54,7 +62,7 @@ namespace detail {
 
     std::ostream & operator<<(std::ostream & os, LogParameters const & pm);
 
-    void senf_console_parse_argument(console::ParseCommandInfo::TokensRange const & tokens, 
+    void senf_console_parse_argument(console::ParseCommandInfo::TokensRange const & tokens,
                                      LogParameters & out);
 
     /** \brief Internal: Target registry */
@@ -62,18 +70,18 @@ namespace detail {
         : public senf::singleton<TargetRegistry>
     {
     public:
-        enum Level { 
-            VERBOSE = senf::log::VERBOSE::value, 
-            NOTICE = senf::log::NOTICE::value, 
-            MESSAGE = senf::log::MESSAGE::value, 
-            IMPORTANT = senf::log::IMPORTANT::value, 
-            CRITICAL = senf::log::CRITICAL::value, 
+        enum Level {
+            VERBOSE = senf::log::VERBOSE::value,
+            NOTICE = senf::log::NOTICE::value,
+            MESSAGE = senf::log::MESSAGE::value,
+            IMPORTANT = senf::log::IMPORTANT::value,
+            CRITICAL = senf::log::CRITICAL::value,
             FATAL = senf::log::FATAL::value
         };
 
         using senf::singleton<TargetRegistry>::instance;
 
-        void write(StreamBase const & stream, AreaBase const & area, unsigned level, 
+        void write(StreamBase const & stream, AreaBase const & area, unsigned level,
                    std::string const & msg);
 
         void routed();
@@ -86,7 +94,7 @@ namespace detail {
     private:
         TargetRegistry();
         ~TargetRegistry();
-        
+
         void registerTarget(Target * target, std::string const & name);
         void unregisterTarget(Target * target);
 
@@ -104,7 +112,7 @@ namespace detail {
         console::LazyDirectory consoleDir_;
 
         Targets dynamicTargets_;
-        
+
         friend class senf::log::Target;
         friend class senf::singleton<TargetRegistry>;
     };
@@ -115,7 +123,7 @@ namespace detail {
 
 #ifndef DOXYGEN
 
-    // This code takes the routing target template arguments in any order and sorts them 
+    // This code takes the routing target template arguments in any order and sorts them
     // by type (Stream, Area and Level).
 
     senf::mpl::rv<0u> RouteParameterCheck_(...);
@@ -200,7 +208,7 @@ namespace detail {
 
 }}}
 
-///////////////////////////////ih.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #endif