From 5b23570d273c37e1a6ba4ee3e021fa2189bffd30 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Wed, 30 Oct 2002 18:40:24 +0000 Subject: [PATCH] upgraded compiler specific macros --- src/ca/bhe.h | 2 +- src/ca/msgForMultiplyDefinedPV.cpp | 2 +- src/ca/nciu.h | 2 +- src/ca/netIO.h | 6 +++--- src/ca/oldAccess.h | 10 +++++----- src/ca/repeater.cpp | 2 +- src/ca/syncGroup.h | 2 +- src/ca/syncGroupReadNotify.cpp | 2 +- src/ca/syncGroupWriteNotify.cpp | 2 +- src/cas/io/bsdSocket/ipIgnoreEntry.cpp | 2 +- src/db/dbChannelIO.cpp | 2 +- src/db/dbPutNotifyBlocker.cpp | 2 +- src/db/dbSubscriptionIO.cpp | 2 +- src/libCom/timer/timerPrivate.h | 4 ++-- 14 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/ca/bhe.h b/src/ca/bhe.h index ea5e0a13d..d5174158b 100644 --- a/src/ca/bhe.h +++ b/src/ca/bhe.h @@ -101,7 +101,7 @@ inline void * bhe::operator new ( size_t size, #ifdef CXX_PLACEMENT_DELETE inline void bhe::operator delete ( void * pCadaver, - bheMemoryManager & mgr ) + bheMemoryManager & mgr ) epicsThrows(()) { mgr.release ( pCadaver ); } diff --git a/src/ca/msgForMultiplyDefinedPV.cpp b/src/ca/msgForMultiplyDefinedPV.cpp index 5c48a3ba7..e7bebed1b 100644 --- a/src/ca/msgForMultiplyDefinedPV.cpp +++ b/src/ca/msgForMultiplyDefinedPV.cpp @@ -62,7 +62,7 @@ void * msgForMultiplyDefinedPV::operator new ( size_t size, #ifdef CXX_PLACEMENT_DELETE void msgForMultiplyDefinedPV::operator delete ( void *pCadaver, - tsFreeList < class msgForMultiplyDefinedPV, 16 > & freeList ) + tsFreeList < class msgForMultiplyDefinedPV, 16 > & freeList ) epicsThrows(()) { freeList.release ( pCadaver, sizeof ( msgForMultiplyDefinedPV ) ); } diff --git a/src/ca/nciu.h b/src/ca/nciu.h index ac1ec116c..8b5251276 100644 --- a/src/ca/nciu.h +++ b/src/ca/nciu.h @@ -144,7 +144,7 @@ inline void * nciu::operator new ( size_t size, #ifdef CXX_PLACEMENT_DELETE inline void nciu::operator delete ( void * pCadaver, - tsFreeList < class nciu, 1024 > & freeList ) + tsFreeList < class nciu, 1024 > & freeList ) epicsThrows(()) { freeList.release ( pCadaver, sizeof ( nciu ) ); } diff --git a/src/ca/netIO.h b/src/ca/netIO.h index 542adcf4e..5f1f8ed47 100644 --- a/src/ca/netIO.h +++ b/src/ca/netIO.h @@ -171,7 +171,7 @@ inline void * netSubscription::operator new ( size_t size, #if defined ( CXX_PLACEMENT_DELETE ) inline void netSubscription::operator delete ( void *pCadaver, - tsFreeList < class netSubscription, 1024, epicsMutexNOOP > &freeList ) + tsFreeList < class netSubscription, 1024, epicsMutexNOOP > &freeList ) epicsThrows(()) { freeList.release ( pCadaver ); } @@ -222,7 +222,7 @@ inline void * netReadNotifyIO::operator new ( size_t size, #if defined ( CXX_PLACEMENT_DELETE ) inline void netReadNotifyIO::operator delete ( void *pCadaver, - tsFreeList < class netReadNotifyIO, 1024, epicsMutexNOOP > &freeList ) + tsFreeList < class netReadNotifyIO, 1024, epicsMutexNOOP > &freeList ) epicsThrows(()) { freeList.release ( pCadaver ); } @@ -243,7 +243,7 @@ inline void * netWriteNotifyIO::operator new ( size_t size, #if defined ( CXX_PLACEMENT_DELETE ) inline void netWriteNotifyIO::operator delete ( void *pCadaver, - tsFreeList < class netWriteNotifyIO, 1024, epicsMutexNOOP > &freeList ) + tsFreeList < class netWriteNotifyIO, 1024, epicsMutexNOOP > &freeList ) epicsThrows(()) { freeList.release ( pCadaver ); } diff --git a/src/ca/oldAccess.h b/src/ca/oldAccess.h index 614590840..e751eef40 100644 --- a/src/ca/oldAccess.h +++ b/src/ca/oldAccess.h @@ -426,7 +426,7 @@ inline void * oldChannelNotify::operator new ( size_t size, #ifdef CXX_PLACEMENT_DELETE inline void oldChannelNotify::operator delete ( void *pCadaver, - tsFreeList < struct oldChannelNotify, 1024 > & freeList ) + tsFreeList < struct oldChannelNotify, 1024 > & freeList ) epicsThrows(()) { freeList.release ( pCadaver ); } @@ -457,7 +457,7 @@ inline void * oldSubscription::operator new ( size_t size, #ifdef CXX_PLACEMENT_DELETE inline void oldSubscription::operator delete ( void *pCadaver, - tsFreeList < struct oldSubscription, 1024 > & freeList ) + tsFreeList < struct oldSubscription, 1024 > & freeList ) epicsThrows(()) { freeList.release ( pCadaver ); } @@ -476,7 +476,7 @@ inline void * getCopy::operator new ( size_t size, #ifdef CXX_PLACEMENT_DELETE inline void getCopy::operator delete ( void *pCadaver, - tsFreeList < class getCopy, 1024 > & freeList ) + tsFreeList < class getCopy, 1024 > & freeList ) epicsThrows(()) { freeList.release ( pCadaver ); } @@ -490,7 +490,7 @@ inline void * putCallback::operator new ( size_t size, #ifdef CXX_PLACEMENT_DELETE inline void putCallback::operator delete ( void * pCadaver, - tsFreeList < class putCallback, 1024 > & freeList ) + tsFreeList < class putCallback, 1024 > & freeList ) epicsThrows(()) { freeList.release ( pCadaver ); } @@ -509,7 +509,7 @@ inline void * getCallback::operator new ( size_t size, #ifdef CXX_PLACEMENT_DELETE inline void getCallback::operator delete ( void *pCadaver, - tsFreeList < class getCallback, 1024 > & freeList ) + tsFreeList < class getCallback, 1024 > & freeList ) epicsThrows(()) { freeList.release ( pCadaver ); } diff --git a/src/ca/repeater.cpp b/src/ca/repeater.cpp index 5750a6366..cc5e1d1a7 100644 --- a/src/ca/repeater.cpp +++ b/src/ca/repeater.cpp @@ -268,7 +268,7 @@ inline void * repeaterClient::operator new ( size_t size, #ifdef CXX_PLACEMENT_DELETE inline void repeaterClient::operator delete ( void *pCadaver, - tsFreeList < repeaterClient, 0x20 > & freeList ) + tsFreeList < repeaterClient, 0x20 > & freeList ) epicsThrows(()) { freeList.release ( pCadaver ); } diff --git a/src/ca/syncGroup.h b/src/ca/syncGroup.h index 751e0f757..1f3d43aad 100644 --- a/src/ca/syncGroup.h +++ b/src/ca/syncGroup.h @@ -194,7 +194,7 @@ inline void * CASG::operator new ( size_t size, # if defined ( CXX_PLACEMENT_DELETE ) inline void CASG::operator delete ( void * pCadaver, - tsFreeList < struct CASG, 128 > & freeList ) + tsFreeList < struct CASG, 128 > & freeList ) epicsThrows(()) { freeList.release ( pCadaver ); } diff --git a/src/ca/syncGroupReadNotify.cpp b/src/ca/syncGroupReadNotify.cpp index 7e57f05e0..bac749161 100644 --- a/src/ca/syncGroupReadNotify.cpp +++ b/src/ca/syncGroupReadNotify.cpp @@ -111,7 +111,7 @@ void * syncGroupReadNotify::operator new ( size_t size, #if defined ( CXX_PLACEMENT_DELETE ) void syncGroupReadNotify::operator delete ( void *pCadaver, - tsFreeList < class syncGroupReadNotify, 128, epicsMutexNOOP > &freeList ) + tsFreeList < class syncGroupReadNotify, 128, epicsMutexNOOP > &freeList ) epicsThrows(()) { freeList.release ( pCadaver ); } diff --git a/src/ca/syncGroupWriteNotify.cpp b/src/ca/syncGroupWriteNotify.cpp index c8f99609b..2bad9b992 100644 --- a/src/ca/syncGroupWriteNotify.cpp +++ b/src/ca/syncGroupWriteNotify.cpp @@ -105,7 +105,7 @@ void * syncGroupWriteNotify::operator new ( size_t size, #if defined ( CXX_PLACEMENT_DELETE ) void syncGroupWriteNotify::operator delete ( void *pCadaver, - tsFreeList < class syncGroupWriteNotify, 128, epicsMutexNOOP > &freeList ) + tsFreeList < class syncGroupWriteNotify, 128, epicsMutexNOOP > &freeList ) epicsThrows(()) { freeList.release ( pCadaver ); } diff --git a/src/cas/io/bsdSocket/ipIgnoreEntry.cpp b/src/cas/io/bsdSocket/ipIgnoreEntry.cpp index 8381154b1..4acc03863 100644 --- a/src/cas/io/bsdSocket/ipIgnoreEntry.cpp +++ b/src/cas/io/bsdSocket/ipIgnoreEntry.cpp @@ -57,7 +57,7 @@ void * ipIgnoreEntry::operator new ( size_t size, #ifdef CXX_PLACEMENT_DELETE void ipIgnoreEntry::operator delete ( void * pCadaver, - tsFreeList < class ipIgnoreEntry, 128 > & freeList ) + tsFreeList < class ipIgnoreEntry, 128 > & freeList ) epicsThrows(()) { freeList.release ( pCadaver ); } diff --git a/src/db/dbChannelIO.cpp b/src/db/dbChannelIO.cpp index 31a9c5128..d892475f6 100644 --- a/src/db/dbChannelIO.cpp +++ b/src/db/dbChannelIO.cpp @@ -137,7 +137,7 @@ void * dbChannelIO::operator new ( size_t size, #ifdef CXX_PLACEMENT_DELETE void dbChannelIO::operator delete ( void *pCadaver, - tsFreeList < dbChannelIO > & freeList ) + tsFreeList < dbChannelIO > & freeList ) epicsThrows(()) { freeList.release ( pCadaver ); } diff --git a/src/db/dbPutNotifyBlocker.cpp b/src/db/dbPutNotifyBlocker.cpp index 78cd24eaf..27e4dab1b 100644 --- a/src/db/dbPutNotifyBlocker.cpp +++ b/src/db/dbPutNotifyBlocker.cpp @@ -190,7 +190,7 @@ void * dbPutNotifyBlocker::operator new ( size_t size, #ifdef CXX_PLACEMENT_DELETE void dbPutNotifyBlocker::operator delete ( void *pCadaver, - tsFreeList < dbPutNotifyBlocker > & freeList ) + tsFreeList < dbPutNotifyBlocker > & freeList ) epicsThrows(()) { freeList.release ( pCadaver ); } diff --git a/src/db/dbSubscriptionIO.cpp b/src/db/dbSubscriptionIO.cpp index c230fcad5..d5221b227 100644 --- a/src/db/dbSubscriptionIO.cpp +++ b/src/db/dbSubscriptionIO.cpp @@ -93,7 +93,7 @@ void * dbSubscriptionIO::operator new ( size_t size, #ifdef CXX_PLACEMENT_DELETE void dbSubscriptionIO::operator delete ( void * pCadaver, - tsFreeList < dbSubscriptionIO > & freeList ) + tsFreeList < dbSubscriptionIO > & freeList ) epicsThrows(()) { freeList.release ( pCadaver ); } diff --git a/src/libCom/timer/timerPrivate.h b/src/libCom/timer/timerPrivate.h index c5cc10247..6724d0ce9 100644 --- a/src/libCom/timer/timerPrivate.h +++ b/src/libCom/timer/timerPrivate.h @@ -223,7 +223,7 @@ inline void * timer::operator new ( size_t size, #ifdef CXX_PLACEMENT_DELETE inline void timer::operator delete ( void * pCadaver, - tsFreeList < timer, 0x20 > & freeList ) + tsFreeList < timer, 0x20 > & freeList ) epicsThrows(()) { freeList.release ( pCadaver ); } @@ -237,7 +237,7 @@ inline void * epicsTimerForC::operator new ( size_t size, #ifdef CXX_PLACEMENT_DELETE inline void epicsTimerForC::operator delete ( void * pCadaver, - tsFreeList < epicsTimerForC, 0x20 > & freeList ) + tsFreeList < epicsTimerForC, 0x20 > & freeList ) epicsThrows(()) { freeList.release ( pCadaver ); }