From 624d8ebe9e884cd3f4bdca4dde2f52582c0e0429 Mon Sep 17 00:00:00 2001
From: Benoit Foucher <benoit@zeroc.com>
Date: Tue, 28 Aug 2007 14:50:28 +0200
Subject: Win32 fixes for IceUtil::Timer

---
 cpp/src/IceUtil/Timer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 cpp/src/IceUtil/Timer.cpp

(limited to 'cpp/src/IceUtil/Timer.cpp')

diff --git a/cpp/src/IceUtil/Timer.cpp b/cpp/src/IceUtil/Timer.cpp
old mode 100644
new mode 100755
index d44534a82cd..9b3d7b0c852
--- 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;
 }
 
-- 
cgit v1.2.3