X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FScheduler%2FTimerEvent.cci;h=450aa32500203b01851c4890f2286c8b4cfb3779;hb=refs%2Fheads%2Fmaster;hp=ad671db5003db37fda054cf31bcaefb3bd6f8583;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Scheduler/TimerEvent.cci b/senf/Scheduler/TimerEvent.cci
index ad671db..450aa32 100644
--- a/senf/Scheduler/TimerEvent.cci
+++ b/senf/Scheduler/TimerEvent.cci
@@ -1,24 +1,29 @@
 // $Id$
 //
-// Copyright (C) 2008 
+// 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 inline non-template implementation */
@@ -29,9 +34,9 @@
 #include <unistd.h>
 
 #define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::scheduler::TimerEvent
 
 prefix_ senf::scheduler::TimerEvent::TimerEvent(std::string const & name, Callback const & cb,
@@ -44,25 +49,25 @@ prefix_ senf::scheduler::TimerEvent::TimerEvent(std::string const & name, Callba
 }
 
 prefix_ senf::scheduler::TimerEvent::TimerEvent(std::string const & name, Callback const & cb)
-    : detail::FIFORunner::TaskInfo (name), cb_ (cb), timeout_ (0)
+    : detail::FIFORunner::TaskInfo (name), cb_ (cb), timeout_(ClockService::clock_type(0))
 {}
 
 prefix_ senf::scheduler::TimerEvent::~TimerEvent()
 {
-    if (senf::scheduler::detail::TimerDispatcher::alive())
+    if (detail::TimerDispatcher::alive())
         disable();
 }
 
 prefix_ void senf::scheduler::TimerEvent::enable()
 {
     if (! detail::TimerSetBase::linked())
-        senf::scheduler::detail::TimerDispatcher::instance().add(*this);
+        detail::TimerDispatcher::instance().add(*this);
 }
 
 prefix_ void senf::scheduler::TimerEvent::disable()
 {
     if (detail::TimerSetBase::linked())
-        senf::scheduler::detail::TimerDispatcher::instance().remove(*this);
+        detail::TimerDispatcher::instance().remove(*this);
 }
 
 prefix_ void senf::scheduler::TimerEvent::action(Callback const & cb)
@@ -70,7 +75,7 @@ prefix_ void senf::scheduler::TimerEvent::action(Callback const & cb)
     cb_ = cb;
 }
 
-prefix_ void senf::scheduler::TimerEvent::timeout(ClockService::clock_type timeout, 
+prefix_ void senf::scheduler::TimerEvent::timeout(ClockService::clock_type timeout,
                                                   bool initiallyEnabled)
 {
     disable();
@@ -85,7 +90,7 @@ prefix_ senf::ClockService::clock_type senf::scheduler::TimerEvent::timeout()
     return timeout_;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::scheduler::detail::TimerDispatcher
 
 prefix_ void senf::scheduler::detail::TimerDispatcher::enable()
@@ -116,7 +121,7 @@ senf::scheduler::detail::TimerDispatcher::timerSource()
     return source_.get();
 }
 
-///////////////////////////////cci.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_