From 4dcd047d59862d7077af945ba04b5ff9c903101b Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Thu, 25 Apr 2002 19:08:42 +0000 Subject: [PATCH] workaround for ms compiler bug --- src/ca/netIO.h | 12 ++++++------ src/ca/netReadNotifyIO.cpp | 2 +- src/ca/netSubscription.cpp | 2 +- src/ca/netWriteNotifyIO.cpp | 2 +- src/ca/syncGroup.h | 8 ++++---- src/ca/syncGroupReadNotify.cpp | 2 +- src/ca/syncGroupWriteNotify.cpp | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/ca/netIO.h b/src/ca/netIO.h index 5528ef95f..a88d1df1b 100644 --- a/src/ca/netIO.h +++ b/src/ca/netIO.h @@ -98,10 +98,10 @@ private: netSubscription ( const netSubscription & ); netSubscription & operator = ( const netSubscription & ); ~netSubscription (); -# if defined (_MSC_VER) && _MSC_VER == 1300 +# if defined (_MSC_VER) && _MSC_VER <= 1300 void operator delete ( void * ); // avoid visual c++ 7 bug # endif -# if __GNUC__==2 && __GNUC_MINOR_<96 +# if __GNUC__==2 && __GNUC_MINOR_<=96 void operator delete ( void *, size_t ); // avoid gnu g++ bug # endif }; @@ -131,10 +131,10 @@ private: ~netReadNotifyIO (); netReadNotifyIO ( const netReadNotifyIO & ); netReadNotifyIO & operator = ( const netReadNotifyIO & ); -# if defined (_MSC_VER) && _MSC_VER == 1300 +# if defined (_MSC_VER) && _MSC_VER <= 1300 void operator delete ( void * ); // avoid visual c++ 7 bug # endif -# if __GNUC__==2 && __GNUC_MINOR_<96 +# if __GNUC__==2 && __GNUC_MINOR_<=96 void operator delete ( void *, size_t ); // avoid gnu g++ bug # endif }; @@ -164,10 +164,10 @@ private: netWriteNotifyIO ( const netWriteNotifyIO & ); netWriteNotifyIO & operator = ( const netWriteNotifyIO & ); ~netWriteNotifyIO (); -# if defined (_MSC_VER) && _MSC_VER == 1300 +# if defined (_MSC_VER) && _MSC_VER <= 1300 void operator delete ( void * ); // avoid visual c++ 7 bug # endif -# if __GNUC__==2 && __GNUC_MINOR_<96 +# if __GNUC__==2 && __GNUC_MINOR_<=96 void operator delete ( void *, size_t ); // avoid gnu g++ bug # endif }; diff --git a/src/ca/netReadNotifyIO.cpp b/src/ca/netReadNotifyIO.cpp index c0effa05a..b93dcb883 100644 --- a/src/ca/netReadNotifyIO.cpp +++ b/src/ca/netReadNotifyIO.cpp @@ -76,7 +76,7 @@ void netReadNotifyIO::completion ( unsigned type, } #endif -# if defined (_MSC_VER) && _MSC_VER == 1300 +# 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?" ); diff --git a/src/ca/netSubscription.cpp b/src/ca/netSubscription.cpp index e9164d4ce..2a299f70d 100644 --- a/src/ca/netSubscription.cpp +++ b/src/ca/netSubscription.cpp @@ -95,7 +95,7 @@ void netSubscription::completion ( unsigned typeIn, } #endif -# if defined (_MSC_VER) && _MSC_VER == 1300 +# 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?" ); diff --git a/src/ca/netWriteNotifyIO.cpp b/src/ca/netWriteNotifyIO.cpp index e557d1f0d..92b9f307d 100644 --- a/src/ca/netWriteNotifyIO.cpp +++ b/src/ca/netWriteNotifyIO.cpp @@ -78,7 +78,7 @@ void netWriteNotifyIO::completion ( unsigned /* type */, } #endif -# if defined (_MSC_VER) && _MSC_VER == 1300 +# 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?" ); diff --git a/src/ca/syncGroup.h b/src/ca/syncGroup.h index 6701babad..1dcde7cba 100644 --- a/src/ca/syncGroup.h +++ b/src/ca/syncGroup.h @@ -101,10 +101,10 @@ private: int status, const char *pContext, unsigned type, arrayElementCount count ); syncGroupReadNotify ( const syncGroupReadNotify & ); syncGroupReadNotify & operator = ( const syncGroupReadNotify & ); -# if defined (_MSC_VER) && _MSC_VER == 1300 +# if defined (_MSC_VER) && _MSC_VER <= 1300 void operator delete ( void * ); // avoid visual c++ 7 bug # endif -# if __GNUC__==2 && __GNUC_MINOR_<96 +# if __GNUC__==2 && __GNUC_MINOR_<=96 void operator delete ( void *, size_t ); // avoid gnu g++ bug # endif }; @@ -134,10 +134,10 @@ private: unsigned type, arrayElementCount count ); syncGroupWriteNotify ( const syncGroupWriteNotify & ); syncGroupWriteNotify & operator = ( const syncGroupWriteNotify & ); -# if defined (_MSC_VER) && _MSC_VER == 1300 +# if defined (_MSC_VER) && _MSC_VER <= 1300 void operator delete ( void * ); // avoid visual c++ 7 bug # endif -# if __GNUC__==2 && __GNUC_MINOR_<96 +# if __GNUC__==2 && __GNUC_MINOR_<=96 void operator delete ( void *, size_t ); // avoid gnu g++ bug # endif }; diff --git a/src/ca/syncGroupReadNotify.cpp b/src/ca/syncGroupReadNotify.cpp index cfbe7a3c3..f3548c1fc 100644 --- a/src/ca/syncGroupReadNotify.cpp +++ b/src/ca/syncGroupReadNotify.cpp @@ -118,7 +118,7 @@ void syncGroupReadNotify::operator delete ( void *pCadaver, } #endif -# if defined (_MSC_VER) && _MSC_VER == 1300 +# 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?" ); diff --git a/src/ca/syncGroupWriteNotify.cpp b/src/ca/syncGroupWriteNotify.cpp index e3c7ec695..3c5fa4811 100644 --- a/src/ca/syncGroupWriteNotify.cpp +++ b/src/ca/syncGroupWriteNotify.cpp @@ -113,7 +113,7 @@ void syncGroupWriteNotify::operator delete ( void *pCadaver, } #endif -# if defined (_MSC_VER) && _MSC_VER == 1300 +# 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?" );