switch to new MPL based Fraunhofer FOKUS Public License

[senf.git] / senf / Utils / StatisticsTargets.ih

diff --git a/senf/Utils/StatisticsTargets.ih b/senf/Utils/StatisticsTargets.ih
index 54c5d00..78c165b 100644 (file)
--- a/senf/Utils/StatisticsTargets.ih
+++ b/senf/Utils/StatisticsTargets.ih
@@ -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 StatisticsTargets internal header */
@@ -31,7 +36,7 @@
 #include <boost/utility.hpp>
 #include <senf/Utils/singleton.hh>
 
-///////////////////////////////ih.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 
@@ -45,7 +50,7 @@ namespace detail {
         : public senf::singleton<StatisticsLoggerRegistry>
     {
     public:
-        typedef void (*AddFn)(senf::StatisticsBase &, unsigned, 
+        typedef void (*AddFn)(senf::StatisticsBase &, unsigned,
                               senf::console::DirectoryNode &);
 
         using senf::singleton<StatisticsLoggerRegistry>::instance;
@@ -65,14 +70,14 @@ namespace detail {
         : boost::noncopyable
     {
         StatisticsLogger(std::string const & label_);
-        void operator()(float min, float avg, float max);
-        
+        void operator()(float min, float avg, float max, float dev);
+
         std::string label;
     };
 
 }}
 
-///////////////////////////////ih.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #endif
 
 \f