diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2007-08-28 14:50:28 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2007-08-28 14:50:28 +0200 |
| commit | 624d8ebe9e884cd3f4bdca4dde2f52582c0e0429 (patch) | |
| tree | c0c2ca846f2acfee09db083370d5444a840f6e07 /cpp/src | |
| parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
| download | ice-624d8ebe9e884cd3f4bdca4dde2f52582c0e0429.tar.bz2 ice-624d8ebe9e884cd3f4bdca4dde2f52582c0e0429.tar.xz ice-624d8ebe9e884cd3f4bdca4dde2f52582c0e0429.zip | |
Win32 fixes for IceUtil::Timer
Diffstat (limited to 'cpp/src')
| -rwxr-xr-x[-rw-r--r--] | cpp/src/IceUtil/Timer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceUtil/Timer.cpp b/cpp/src/IceUtil/Timer.cpp index d44534a82cd..9b3d7b0c852 100644..100755 --- a/cpp/src/IceUtil/Timer.cpp +++ b/cpp/src/IceUtil/Timer.cpp @@ -100,16 +100,16 @@ Timer::cancel(const TimerTaskPtr& task) { return false; } - _tasks.erase(p); #if defined(_MSC_VER) && (_MSC_VER < 1300) Token token; token.scheduledTime = p->second; - token.task = task = p->first; + token.task = p->first; #else Token token = { p->second, IceUtil::Time(), p->first }; #endif _tokens.erase(token); + _tasks.erase(p); return true; } |