From b023f081eba46c77eed54c1d648982797deffe34 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Thu, 24 Oct 2002 00:18:12 +0000 Subject: [PATCH] fixed linux compiler errors --- src/libCom/timer/epicsTimer.cpp | 4 ++-- src/libCom/timer/timer.cpp | 4 ++-- src/libCom/timer/timerPrivate.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libCom/timer/epicsTimer.cpp b/src/libCom/timer/epicsTimer.cpp index 26300cebf..8cc64eafa 100644 --- a/src/libCom/timer/epicsTimer.cpp +++ b/src/libCom/timer/epicsTimer.cpp @@ -39,7 +39,7 @@ epicsTimerNotify::~epicsTimerNotify () {} void epicsTimerNotify::show ( unsigned /* level */ ) const {} -epicsTimerForC::epicsTimerForC ( timerQueue &queue, epicsTimerCallback pCBIn, void *pPrivateIn ) : +epicsTimerForC::epicsTimerForC ( timerQueue &queue, epicsTimerCallback pCBIn, void *pPrivateIn ) throw () : timer ( queue ), pCallBack ( pCBIn ), pPrivate ( pPrivateIn ) { } @@ -70,7 +70,7 @@ epicsTimerQueueActiveForC::~epicsTimerQueueActiveForC () { } -void epicsTimerQueueActiveForC::release () +void epicsTimerQueueActiveForC::release () throw () { epicsSingleton < timerQueueActiveMgr >::reference pMgr = timerQueueMgrEPICS; diff --git a/src/libCom/timer/timer.cpp b/src/libCom/timer/timer.cpp index 637b8c4a1..58932fc3b 100644 --- a/src/libCom/timer/timer.cpp +++ b/src/libCom/timer/timer.cpp @@ -35,8 +35,8 @@ template class tsFreeList < timer, 0x20 >; # pragma warning ( pop ) #endif -timer::timer ( timerQueue & queueIn ) : - queue ( queueIn ), curState ( stateLimbo ), pNotify ( 0 ) +timer::timer ( timerQueue & queueIn ) throw (): + queue ( queueIn ), curState ( stateLimbo ), pNotify ( 0 ) { } diff --git a/src/libCom/timer/timerPrivate.h b/src/libCom/timer/timerPrivate.h index d9cd44c04..bed566e826 100644 --- a/src/libCom/timer/timerPrivate.h +++ b/src/libCom/timer/timerPrivate.h @@ -190,7 +190,7 @@ struct epicsTimerQueueActiveForC : public timerQueueActive, public tsDLNode < epicsTimerQueueActiveForC > { public: epicsTimerQueueActiveForC ( bool okToShare, unsigned priority ); - void release (); + void release () throw(); void * operator new ( size_t ); void operator delete ( void * ); protected: