diff --git a/src/ca/syncGroupReadNotify.cpp b/src/ca/syncGroupReadNotify.cpp index e8a83f6c7..875ca195f 100644 --- a/src/ca/syncGroupReadNotify.cpp +++ b/src/ca/syncGroupReadNotify.cpp @@ -92,14 +92,10 @@ void syncGroupReadNotify::show ( unsigned level ) const } } -void * syncGroupReadNotify::operator new ( size_t sizeIn ) -{ - return ::operator new ( sizeIn ); -} - void syncGroupReadNotify::operator delete ( void * p ) { - ::operator delete ( p ); + throw std::logic_error + ( "compiler is confused about placement delete" ); } void * syncGroupReadNotify::operator new ( size_t size, @@ -108,10 +104,10 @@ void * syncGroupReadNotify::operator new ( size_t size, return freeList.allocate ( size ); } -#if defined ( CASG_PLACEMENT_DELETE ) +#if defined ( CXX_PLACEMENT_DELETE ) void syncGroupReadNotify::operator delete ( void *pCadaver, tsFreeList < class syncGroupReadNotify, 128, epicsMutexNOOP > &freeList ) { - freeList.release ( pCadaver, sizeof ( syncGroupReadNotify ) ); + freeList.release ( pCadaver ); } #endif diff --git a/src/ca/syncGroupWriteNotify.cpp b/src/ca/syncGroupWriteNotify.cpp index 09a2b758e..f8e911982 100644 --- a/src/ca/syncGroupWriteNotify.cpp +++ b/src/ca/syncGroupWriteNotify.cpp @@ -86,14 +86,10 @@ void syncGroupWriteNotify::show ( unsigned level ) const } } -void * syncGroupWriteNotify::operator new ( size_t sizeIn ) -{ - return ::operator new ( sizeIn ); -} - void syncGroupWriteNotify::operator delete ( void * p ) { - ::operator delete ( p ); + throw std::logic_error + ( "compiler is confused about placement delete" ); } void * syncGroupWriteNotify::operator new ( size_t size, @@ -102,11 +98,11 @@ void * syncGroupWriteNotify::operator new ( size_t size, return freeList.allocate ( size ); } -#if defined ( CASG_PLACEMENT_DELETE ) +#if defined ( CXX_PLACEMENT_DELETE ) void syncGroupWriteNotify::operator delete ( void *pCadaver, tsFreeList < class syncGroupWriteNotify, 128, epicsMutexNOOP > &freeList ) { - freeList.release ( pCadaver, sizeof ( syncGroupWriteNotify ) ); + freeList.release ( pCadaver ); } #endif