X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FScheduler.cci;h=162635dbb0649aed5c253d5386f48d2040f42e4e;hb=6f50bf49e282c0528f51faa0a245bbfa2b867399;hp=a7274003a911f3384dcb1a0eb8ddb7b5f436179f;hpb=3d16600678b948ff3bd0e4fd2a1a800fcc629a03;p=senf.git

diff --git a/Scheduler/Scheduler.cci b/Scheduler/Scheduler.cci
index a727400..162635d 100644
--- a/Scheduler/Scheduler.cci
+++ b/Scheduler/Scheduler.cci
@@ -1,9 +1,9 @@
 // $Id$
 //
 // Copyright (C) 2006
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// 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
@@ -38,13 +38,14 @@ prefix_ senf::Scheduler::Scheduler & senf::Scheduler::instance()
 }
 
 prefix_ unsigned senf::Scheduler::timeout(ClockService::clock_type timeout,
-                                          TimerCallback const & cb)
+                                          SimpleCallback const & cb)
 {
+    ++ timerIdCounter_;
     TimerMap::iterator i (
         timerMap_.insert(std::make_pair(timerIdCounter_, 
                                         TimerSpec(timeout,cb,timerIdCounter_))).first);
     timerQueue_.push(i);
-    return timerIdCounter_++;
+    return timerIdCounter_;
 }
 
 prefix_ void senf::Scheduler::cancelTimeout(unsigned id)