X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/27198be4ef37e67c6b088de9387f68a0df574bad..c52486391b86543e189e9991d6ccba3b9483f287:/include/wx/memory.h diff --git a/include/wx/memory.h b/include/wx/memory.h index 664db4e288..8f4d7a1270 100644 --- a/include/wx/memory.h +++ b/include/wx/memory.h @@ -53,17 +53,25 @@ void wxDebugFree(void * buf, bool isVect = FALSE); #undef new #endif +#if defined(__SUNCC__) +#define wxUSE_ARRAY_MEMORY_OPERATORS 0 +#elif !( defined (_MSC_VER) && (_MSC_VER <= 1020) ) || defined( __MWERKS__) +#define wxUSE_ARRAY_MEMORY_OPERATORS 1 +#else +#define wxUSE_ARRAY_MEMORY_OPERATORS 0 +#endif + // Added JACS 25/11/98: needed for some compilers void * operator new (size_t size); -#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) ) || defined( __MWERKS__) +#if wxUSE_ARRAY_MEMORY_OPERATORS void * operator new[] (size_t size); #endif void * operator new (size_t size, char * fileName, int lineNum); void operator delete (void * buf); -#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) ) || defined( __MWERKS__) +#if wxUSE_ARRAY_MEMORY_OPERATORS void * operator new[] (size_t size, char * fileName, int lineNum); void operator delete[] (void * buf); #endif