diff --git a/src/ca/netReadNotifyIO.cpp b/src/ca/netReadNotifyIO.cpp index b93dcb883..852c1f053 100644 --- a/src/ca/netReadNotifyIO.cpp +++ b/src/ca/netReadNotifyIO.cpp @@ -79,7 +79,14 @@ void netReadNotifyIO::completion ( unsigned type, # if defined (_MSC_VER) && _MSC_VER <= 1300 void netReadNotifyIO::operator delete ( void * ) // avoid visual c++ 7 bug { - throw std::logic_error ( "_MSC_VER == 1300 bogus stub called?" ); + throw std::logic_error ( "bogus operator delete called?" ); + } +# endif + +# if __GNUC__==2 && __GNUC_MINOR_<=96 + void netReadNotifyIO::operator delete ( void *, size_t ) // avoid gnu g++ bug + { + throw std::logic_error ( "bogus operator delete called?" ); } # endif diff --git a/src/ca/netSubscription.cpp b/src/ca/netSubscription.cpp index 2a299f70d..22c2639e8 100644 --- a/src/ca/netSubscription.cpp +++ b/src/ca/netSubscription.cpp @@ -98,10 +98,18 @@ void netSubscription::completion ( unsigned typeIn, # if defined (_MSC_VER) && _MSC_VER <= 1300 void netSubscription::operator delete ( void * ) // avoid visual c++ 7 bug { - throw std::logic_error ( "_MSC_VER == 1300 bogus stub called?" ); + throw std::logic_error ( "bogus operator delete called?" ); + } +# endif + +# if __GNUC__==2 && __GNUC_MINOR_<=96 + void netSubscription::operator delete ( void *, size_t ) // avoid gnu g++ bug + { + throw std::logic_error ( "bogus operator delete called?" ); } # endif + diff --git a/src/ca/netWriteNotifyIO.cpp b/src/ca/netWriteNotifyIO.cpp index 92b9f307d..01393a8d3 100644 --- a/src/ca/netWriteNotifyIO.cpp +++ b/src/ca/netWriteNotifyIO.cpp @@ -81,7 +81,14 @@ void netWriteNotifyIO::completion ( unsigned /* type */, # if defined (_MSC_VER) && _MSC_VER <= 1300 void netWriteNotifyIO::operator delete ( void * ) // avoid visual c++ 7 bug { - throw std::logic_error ( "_MSC_VER == 1300 bogus stub called?" ); + throw std::logic_error ( "bogus operator delete called?" ); + } +# endif + +# if __GNUC__==2 && __GNUC_MINOR_<=96 + void netWriteNotifyIO::operator delete ( void *, size_t ) // avoid gnu g++ bug + { + throw std::logic_error ( "bogus operator delete called?" ); } # endif diff --git a/src/ca/syncGroupReadNotify.cpp b/src/ca/syncGroupReadNotify.cpp index f3548c1fc..5778b9b92 100644 --- a/src/ca/syncGroupReadNotify.cpp +++ b/src/ca/syncGroupReadNotify.cpp @@ -121,7 +121,14 @@ void syncGroupReadNotify::operator delete ( void *pCadaver, # if defined (_MSC_VER) && _MSC_VER <= 1300 void syncGroupReadNotify::operator delete ( void * ) // avoid visual c++ 7 bug { - throw std::logic_error ( "_MSC_VER == 1300 bogus stub called?" ); + throw std::logic_error ( "bogus operator delete called?" ); + } +# endif + +# if __GNUC__==2 && __GNUC_MINOR_<=96 + void syncGroupReadNotify::operator delete ( void *, size_t ) // avoid gnu g++ bug + { + throw std::logic_error ( "bogus operator delete called?" ); } # endif diff --git a/src/ca/syncGroupWriteNotify.cpp b/src/ca/syncGroupWriteNotify.cpp index 3c5fa4811..bc4050be9 100644 --- a/src/ca/syncGroupWriteNotify.cpp +++ b/src/ca/syncGroupWriteNotify.cpp @@ -116,7 +116,14 @@ void syncGroupWriteNotify::operator delete ( void *pCadaver, # if defined (_MSC_VER) && _MSC_VER <= 1300 void syncGroupWriteNotify::operator delete ( void * ) // avoid visual c++ 7 bug { - throw std::logic_error ( "_MSC_VER == 1300 bogus stub called?" ); + throw std::logic_error ( "bogus operator delete called?" ); + } +# endif + +# if __GNUC__==2 && __GNUC_MINOR_<=96 + void syncGroupWriteNotify::operator delete ( void *, size_t ) // avoid gnu g++ bug + { + throw std::logic_error ( "bogus operator delete called?" ); } # endif