diff --git a/src/libCom/timer/timerPrivate.h b/src/libCom/timer/timerPrivate.h index 9701cf02a..305d3bc6f 100644 --- a/src/libCom/timer/timerPrivate.h +++ b/src/libCom/timer/timerPrivate.h @@ -107,7 +107,6 @@ private: epicsTime exceptMsgTimeStamp; bool cancelPending; static const double exceptMsgMinPeriod; - static const double maxDelay; void printExceptMsg ( const char * pName, const type_info & type ); timerQueue ( const timerQueue & ); diff --git a/src/libCom/timer/timerQueue.cpp b/src/libCom/timer/timerQueue.cpp index 915c6153f..5a798d4d4 100644 --- a/src/libCom/timer/timerQueue.cpp +++ b/src/libCom/timer/timerQueue.cpp @@ -21,7 +21,6 @@ #include "errlog.h" const double timerQueue :: exceptMsgMinPeriod = 60.0 * 5.0; // seconds -const double timerQueue :: maxDelay = 60 * 60 * 24 * 365242.5; // ~1000 years epicsTimerQueue::~epicsTimerQueue () {} @@ -58,7 +57,7 @@ void timerQueue :: } } catch ( ... ) { - delay = maxDelay; + delay = DBL_MAX; strcpy ( date, "UKN DATE" ); } if ( delay >= exceptMsgMinPeriod ) { @@ -92,7 +91,7 @@ double timerQueue::process ( const epicsTime & currentTime ) return delay; } else { - return maxDelay; + return DBL_MAX; } } @@ -117,14 +116,14 @@ double timerQueue::process ( const epicsTime & currentTime ) } } else { - return maxDelay; + return DBL_MAX; } # ifdef DEBUG unsigned N = 0u; # endif - double delay = maxDelay; + double delay = DBL_MAX; while ( true ) { epicsTimerNotify *pTmpNotify = this->pExpireTmr->pNotify; this->pExpireTmr->pNotify = 0; @@ -195,7 +194,7 @@ double timerQueue::process ( const epicsTime & currentTime ) } else { this->processThread = 0; - delay = maxDelay; + delay = DBL_MAX; break; } }