mirror of
https://github.com/pocoproject/poco.git
synced 2025-02-20 06:17:15 +01:00
added POCO_VERSION macro to Poco/Foundation.h, fixed SF# 2807527
This commit is contained in:
parent
f2ca58ff73
commit
81918bf522
@ -42,6 +42,12 @@
|
||||
#define Foundation_Foundation_INCLUDED
|
||||
|
||||
|
||||
//
|
||||
// Version Information
|
||||
//
|
||||
#define POCO_VERSION 0x010400D0
|
||||
|
||||
|
||||
//
|
||||
// Include library configuration
|
||||
//
|
||||
|
@ -1,7 +1,7 @@
|
||||
//
|
||||
// Timer.h
|
||||
//
|
||||
// $Id: //poco/Main/Foundation/include/Poco/Timer.h#5 $
|
||||
// $Id: //poco/Main/Foundation/include/Poco/Timer.h#6 $
|
||||
//
|
||||
// Library: Foundation
|
||||
// Package: Threading
|
||||
@ -161,7 +161,7 @@ private:
|
||||
Event _wakeUp;
|
||||
Event _done;
|
||||
AbstractTimerCallback* _pCallback;
|
||||
Poco::Timestamp _nextInvocation;
|
||||
Timestamp _nextInvocation;
|
||||
mutable FastMutex _mutex;
|
||||
|
||||
Timer(const Timer&);
|
||||
|
@ -1,7 +1,7 @@
|
||||
//
|
||||
// Timer.cpp
|
||||
//
|
||||
// $Id: //poco/Main/Foundation/src/Timer.cpp#14 $
|
||||
// $Id: //poco/Main/Foundation/src/Timer.cpp#15 $
|
||||
//
|
||||
// Library: Foundation
|
||||
// Package: Threading
|
||||
@ -78,7 +78,7 @@ void Timer::start(const AbstractTimerCallback& method, ThreadPool& threadPool)
|
||||
|
||||
void Timer::start(const AbstractTimerCallback& method, Thread::Priority priority, ThreadPool& threadPool)
|
||||
{
|
||||
Poco::Timestamp nextInvocation;
|
||||
Timestamp nextInvocation;
|
||||
nextInvocation += _startInterval*1000;
|
||||
|
||||
poco_assert (!_pCallback);
|
||||
@ -161,7 +161,7 @@ void Timer::setPeriodicInterval(long milliseconds)
|
||||
|
||||
void Timer::run()
|
||||
{
|
||||
Poco::Timestamp now;
|
||||
Timestamp now;
|
||||
long interval(0);
|
||||
do
|
||||
{
|
||||
@ -197,7 +197,7 @@ void Timer::run()
|
||||
interval = _periodicInterval;
|
||||
}
|
||||
}
|
||||
_nextInvocation += interval*1000;
|
||||
_nextInvocation += static_cast<Timestamp::TimeDiff>(interval)*1000;
|
||||
}
|
||||
while (interval > 0);
|
||||
_done.set();
|
||||
|
Loading…
x
Reference in New Issue
Block a user