porting rev. 1914 from 1.4.4 branch (fixed SF# 3543047)

This commit is contained in:
Aleksandar Fabijanic 2012-08-18 02:41:15 +00:00
parent 369218ef37
commit 2adfe178c0

View File

@ -80,7 +80,7 @@ void Timer::start(const AbstractTimerCallback& method, ThreadPool& threadPool)
void Timer::start(const AbstractTimerCallback& method, Thread::Priority priority, ThreadPool& threadPool) void Timer::start(const AbstractTimerCallback& method, Thread::Priority priority, ThreadPool& threadPool)
{ {
Timestamp nextInvocation; Timestamp nextInvocation;
nextInvocation += _startInterval*1000; nextInvocation += static_cast<Timestamp::TimeVal>(_startInterval)*1000;
poco_assert (!_pCallback); poco_assert (!_pCallback);
@ -178,7 +178,7 @@ void Timer::run()
sleep = 0; sleep = 0;
break; break;
} }
_nextInvocation += interval*1000; _nextInvocation += static_cast<Timestamp::TimeVal>(_startInterval)*1000;
++_skipped; ++_skipped;
} }
} }
@ -210,7 +210,7 @@ void Timer::run()
} }
interval = _periodicInterval; interval = _periodicInterval;
} }
_nextInvocation += interval*1000; _nextInvocation += static_cast<Timestamp::TimeVal>(_startInterval)*1000;
_skipped = 0; _skipped = 0;
} }
while (interval > 0); while (interval > 0);