fixed mantis 332
This commit is contained in:
@@ -64,8 +64,10 @@ epicsTimerNotify::expireStatus epicsTimerForC::expire ( const epicsTime & )
|
||||
return noRestart;
|
||||
}
|
||||
|
||||
epicsTimerQueueActiveForC::epicsTimerQueueActiveForC ( bool okToShare, unsigned priority ) :
|
||||
timerQueueActive ( okToShare, priority )
|
||||
epicsTimerQueueActiveForC ::
|
||||
epicsTimerQueueActiveForC ( RefMgr & refMgr,
|
||||
bool okToShare, unsigned priority ) :
|
||||
timerQueueActive ( refMgr, okToShare, priority )
|
||||
{
|
||||
}
|
||||
|
||||
@@ -75,9 +77,7 @@ epicsTimerQueueActiveForC::~epicsTimerQueueActiveForC ()
|
||||
|
||||
void epicsTimerQueueActiveForC::release ()
|
||||
{
|
||||
epicsSingleton < timerQueueActiveMgr >::reference pMgr =
|
||||
timerQueueMgrEPICS.getReference ();
|
||||
pMgr->release ( *this );
|
||||
_refMgr->release ( *this );
|
||||
}
|
||||
|
||||
epicsTimerQueuePassiveForC::epicsTimerQueuePassiveForC (
|
||||
@@ -203,10 +203,10 @@ extern "C" epicsTimerQueueId epicsShareAPI
|
||||
epicsTimerQueueAllocate ( int okToShare, unsigned int threadPriority )
|
||||
{
|
||||
try {
|
||||
epicsSingleton < timerQueueActiveMgr >::reference ref =
|
||||
epicsSingleton < timerQueueActiveMgr > :: reference ref =
|
||||
timerQueueMgrEPICS.getReference ();
|
||||
epicsTimerQueueActiveForC & tmr =
|
||||
ref->allocate ( okToShare ? true : false, threadPriority );
|
||||
ref->allocate ( ref, okToShare ? true : false, threadPriority );
|
||||
return &tmr;
|
||||
}
|
||||
catch ( ... ) {
|
||||
|
||||
Reference in New Issue
Block a user