epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

upgraded compiler specific macros

Browse Source
This commit is contained in:
Jeff Hill
2002-10-30 17:19:26 +00:00
parent f0b5bbf467
commit 0dce06f4cf
8 changed files with 51 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libCom/timer/epicsTimer.cpp
+3 -7
View File
@@ -39,7 +39,7 @@ epicsTimerNotify::~epicsTimerNotify () {}
void epicsTimerNotify::show ( unsigned /* level */ ) const {}
epicsTimerForC::epicsTimerForC ( timerQueue &queue, epicsTimerCallback pCBIn, void *pPrivateIn ) epics_throws (()) :
epicsTimerForC::epicsTimerForC ( timerQueue &queue, epicsTimerCallback pCBIn, void *pPrivateIn ) epicsThrows (()) :
timer ( queue ), pCallBack ( pCBIn ), pPrivate ( pPrivateIn )
{
}
@@ -52,11 +52,7 @@ void epicsTimerForC::destroy ()
{
timerQueue & queueTmp ( this->queue );
this->~epicsTimerForC ();
# ifdef CXX_PLACEMENT_DELETE
epicsTimerForC::operator delete ( this, queueTmp.timerForCFreeList );
# else
queueTmp.timerForCFreeList.release ( this );
# endif
queueTmp.timerForCFreeList.release ( this );
}
epicsTimerNotify::expireStatus epicsTimerForC::expire ( const epicsTime & )
@@ -74,7 +70,7 @@ epicsTimerQueueActiveForC::~epicsTimerQueueActiveForC ()
{
}
void epicsTimerQueueActiveForC::release () epics_throws (())
void epicsTimerQueueActiveForC::release () epicsThrows (())
{
epicsSingleton < timerQueueActiveMgr >::reference pMgr =
timerQueueMgrEPICS;
src/libCom/timer/timer.cpp
+1 -1
View File
@@ -35,7 +35,7 @@ template class tsFreeList < timer, 0x20 >;
# pragma warning ( pop )
#endif
timer::timer ( timerQueue & queueIn ) epics_throws (()):
timer::timer ( timerQueue & queueIn ) epicsThrows (()):
queue ( queueIn ), curState ( stateLimbo ), pNotify ( 0 )
{
}
src/libCom/timer/timerPrivate.h
+5 -9
View File
@@ -41,11 +41,9 @@ public:
expireInfo getExpireInfo () const;
void show ( unsigned int level ) const;
void * operator new ( size_t size, tsFreeList < timer, 0x20 > & );
#ifdef CXX_PLACEMENT_DELETE
void operator delete ( void *, tsFreeList < timer, 0x20 > & );
#endif
epicsPlacementDeleteOperator (( void *, tsFreeList < timer, 0x20 > & ))
protected:
timer ( class timerQueue & ) epics_throws (());
timer ( class timerQueue & ) epicsThrows (());
~timer ();
timerQueue & queue;
private:
@@ -69,12 +67,10 @@ struct epicsTimerForC : public epicsTimerNotify, public timer {
public:
void destroy ();
protected:
epicsTimerForC ( timerQueue &, epicsTimerCallback, void *pPrivateIn ) epics_throws (());
epicsTimerForC ( timerQueue &, epicsTimerCallback, void *pPrivateIn ) epicsThrows (());
~epicsTimerForC ();
void * operator new ( size_t size, tsFreeList < epicsTimerForC, 0x20 > & );
#ifdef CXX_PLACEMENT_DELETE
void operator delete ( void *, tsFreeList < epicsTimerForC, 0x20 > & );
#endif
epicsPlacementDeleteOperator (( void *, tsFreeList < epicsTimerForC, 0x20 > & ))
private:
epicsTimerCallback pCallBack;
void * pPrivate;
@@ -199,7 +195,7 @@ struct epicsTimerQueueActiveForC : public timerQueueActive,
public tsDLNode < epicsTimerQueueActiveForC > {
public:
epicsTimerQueueActiveForC ( bool okToShare, unsigned priority );
void release () epics_throws (());
void release () epicsThrows (());
void * operator new ( size_t );
void operator delete ( void * );
protected: