X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FScheduler%2FTimerEvent.hh;h=396d8fde005c4d0b55cce7da828efeeecca74932;hb=refs%2Fheads%2Fmaster;hp=d87dca38680769b0c1badbb095ef271ec277361a;hpb=8f1ff66f5b7d10cfc6d35fb72267bc2fb3b588f7;p=senf.git

diff --git a/senf/Scheduler/TimerEvent.hh b/senf/Scheduler/TimerEvent.hh
index d87dca3..396d8fd 100644
--- a/senf/Scheduler/TimerEvent.hh
+++ b/senf/Scheduler/TimerEvent.hh
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2008
 // 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 TimerDispatcher public header */
@@ -34,7 +39,7 @@
 #include <senf/Utils/Logger/SenfLog.hh>
 
 //#include "TimerEvent.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace scheduler {
@@ -69,14 +74,14 @@ namespace scheduler {
           public detail::TimerSetBase
     {
     public:
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         // Types
 
         typedef boost::function<void ()> Callback;
 
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         ///\name Structors and default members
-        ///@{
+        //\{
 
         TimerEvent(std::string const & name, Callback const & cb, ClockService::clock_type timeout,
                    bool initiallyEnabled = true);
@@ -102,8 +107,8 @@ namespace scheduler {
                                              \param[in] cb Callback to call. */
         ~TimerEvent();
 
-        ///@}
-        ///////////////////////////////////////////////////////////////////////////
+        //\}
+        //-////////////////////////////////////////////////////////////////////////
 
         void disable();                 ///< Disable timer
         void enable();                  ///< Enable timer
@@ -126,12 +131,12 @@ namespace scheduler {
         ClockService::clock_type timeout_;
 
         friend class detail::TimerDispatcher;
-        friend class detail::TimerSetCompare;
+        friend struct detail::TimerSetCompare;
     };
 
 }}
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #include "TimerEvent.cci"
 //#include "TimerEvent.ct"
 //#include "TimerEvent.cti"