diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2007-09-25 18:12:47 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2007-09-25 18:12:47 +0200 |
| commit | 96e45b30cd3dda2a13a029ef564a786a3546f316 (patch) | |
| tree | 97f4d030a2d8f8555cb4ed3b6d80802d80cda283 /cpp/src/IceUtil/Timer.cpp | |
| parent | Fixed missing assignment (diff) | |
| parent | Fixed bug 2480 & 2481 (diff) | |
| download | ice-96e45b30cd3dda2a13a029ef564a786a3546f316.tar.bz2 ice-96e45b30cd3dda2a13a029ef564a786a3546f316.tar.xz ice-96e45b30cd3dda2a13a029ef564a786a3546f316.zip | |
Merge branch 'timer-fixes'
Diffstat (limited to 'cpp/src/IceUtil/Timer.cpp')
| -rwxr-xr-x | cpp/src/IceUtil/Timer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/IceUtil/Timer.cpp b/cpp/src/IceUtil/Timer.cpp index adca267c58e..9b6fba19a16 100755 --- a/cpp/src/IceUtil/Timer.cpp +++ b/cpp/src/IceUtil/Timer.cpp @@ -42,7 +42,7 @@ Timer::destroy() } void -Timer::schedule(const TimerTaskPtr& task, const IceUtil::Time& time) +Timer::schedule(const TimerTaskPtr& task, const IceUtil::Time& delay) { IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor); if(_destroyed) @@ -50,6 +50,7 @@ Timer::schedule(const TimerTaskPtr& task, const IceUtil::Time& time) return; } + IceUtil::Time time = IceUtil::Time::now(IceUtil::Time::Monotonic) + delay; bool inserted = _tasks.insert(make_pair(task, time)).second; if(!inserted) { |