X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FLogger%2FLogFormat.hh;h=5c796679caf1c4a1322056471f6a2718f8a68dcf;hb=refs%2Fheads%2Fmaster;hp=96bd3fa8f91ff5bee66ff42523a782feab55c4d0;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git

diff --git a/senf/Utils/Logger/LogFormat.hh b/senf/Utils/Logger/LogFormat.hh
index 96bd3fa..5c79667 100644
--- a/senf/Utils/Logger/LogFormat.hh
+++ b/senf/Utils/Logger/LogFormat.hh
@@ -1,24 +1,29 @@
 // $Id$
 //
-// Copyright (C) 2009 
+// Copyright (C) 2009
 // 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 LogFormat public header */
@@ -28,11 +33,11 @@
 
 // Custom includes
 #include <sstream>
-#include "Target.hh"
+#include "TimeSource.hh"
 #include <senf/Utils/Console/LazyDirectory.hh>
 
 //#include "LogFormat.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace log {
@@ -66,7 +71,7 @@ namespace detail {
         void tag(std::string const & tag); ///< Set tag (log line prefix)
 
     protected:
-        std::string prefix(time_type timestamp, std::string const & stream, 
+        std::string prefix(time_type timestamp, std::string const & stream,
                            std::string const & area, unsigned level);
         bool isPlainFormat() const;
         void consoleFormat(std::ostream & os);
@@ -89,7 +94,7 @@ namespace detail {
 
 }}}
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #include "LogFormat.cci"
 //#include "LogFormat.ct"
 //#include "LogFormat.cti"