X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FLogger%2FTarget.hh;h=8fa2177f37ec133fba21490e2ea8f40875649a13;hb=0003d55730b447329342161d12cf2ed23b63459e;hp=40a21650f2d5822c124c956749e3e36d11366443;hpb=9cb871b939efe93e35dd96808d25089399acfc46;p=senf.git

diff --git a/senf/Utils/Logger/Target.hh b/senf/Utils/Logger/Target.hh
index 40a2165..8fa2177 100644
--- a/senf/Utils/Logger/Target.hh
+++ b/senf/Utils/Logger/Target.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 Target public header */
@@ -27,19 +32,15 @@
 #define HH_SENF_Utils_Logger_Target_ 1
 
 // Custom includes
-#include <set>
 #include <vector>
 #include <boost/utility.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <senf/Utils/singleton.hh>
-#include <senf/Utils/mpl.hh>
-#include "StreamRegistry.hh"
 #include <senf/Utils/Exception.hh>
-#include "TimeSource.hh"
 #include <senf/Utils/Console/LazyDirectory.hh>
+#include "TimeSource.hh"
+#include "Levels.hh"
 
 //#include "Target.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 /** \defgroup targets Targets
 
@@ -57,6 +58,7 @@ namespace log {
     namespace detail { class TargetRegistry; }
     namespace detail { class AreaBase; }
     namespace detail { struct LogParameters; }
+    namespace detail { struct StreamBase; }
 
     /** \brief Logging target base class
 
@@ -145,7 +147,7 @@ namespace log {
     class Target : private boost::noncopyable
     {
     public:
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         // Types
 
         /** \brief Routing action
@@ -198,17 +200,17 @@ namespace log {
         typedef RIB::const_iterator iterator; ///< Routing table iterator
         typedef RIB::size_type size_type;
 
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         ///\name Structors and default members
-        ///@{
+        //\{
 
         explicit Target(std::string const & name);
         virtual ~Target();
 
-        ///@}
-        ///////////////////////////////////////////////////////////////////////////
+        //\}
+        //-////////////////////////////////////////////////////////////////////////
         ///\name Routing
-        ///\{
+        //\{
 
 #       ifdef DOXYGEN
 
@@ -335,7 +337,7 @@ namespace log {
 
 #       endif
 
-        ///\}
+        //\}
 
         /** \brief Exception: Invalid stream */
         struct InvalidStreamException : public senf::Exception
@@ -418,7 +420,7 @@ namespace log {
 
 }}
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #include "Target.cci"
 //#include "Target.ct"
 #include "Target.cti"