X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ea57084d103187771c0306a6e1684e32244d6101..8ffd43c56b793781fde046aa532340b92a0067eb:/include/wx/memory.h?ds=sidebyside diff --git a/include/wx/memory.h b/include/wx/memory.h index 0afeaf4ebd..23f64dca35 100644 --- a/include/wx/memory.h +++ b/include/wx/memory.h @@ -6,7 +6,7 @@ // Created: 29/01/98 // RCS-ID: $Id$ // Copyright: (c) 1998 Julian Smart -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_MEMORYH__ @@ -17,6 +17,7 @@ #endif #include "wx/defs.h" +#include "wx/string.h" /* The macro which will be expanded to include the file and line number @@ -28,51 +29,65 @@ #include #if wxUSE_IOSTREAMH -// N.B. BC++ doesn't have istream.h, ostream.h -# include + // N.B. BC++ doesn't have istream.h, ostream.h +# include #else -# include -# ifdef _MSC_VER - using namespace std; -# endif +# include +# if defined(__VISUALC__) || defined(__MWERKS__) + using namespace std; +# endif #endif -#include "wx/string.h" - #ifdef __WXDEBUG__ -// #ifndef WXDEBUG_NEW -// #define WXDEBUG_NEW new(__FILE__,__LINE__) -// #endif - void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bool isVect = FALSE); void wxDebugFree(void * buf, bool isVect = FALSE); // Global versions of the new and delete operators. -// Currently, these merely call malloc and free; only the wxObject -// operators do something interesting. But this allows WXDEBUG_NEW to -// work for all 'new's in a file. #if wxUSE_GLOBAL_MEMORY_OPERATORS +// Undefine temporarily (new is #defined in object.h) because we want to +// declare some new operators. #ifdef new -#undef new + #undef new +#endif + +#if defined(__SUNCC__) + #define wxUSE_ARRAY_MEMORY_OPERATORS 0 +#elif !( defined (__VISUALC__) && (__VISUALC__ <= 1020) ) || defined( __MWERKS__) + #define wxUSE_ARRAY_MEMORY_OPERATORS 1 +#elif defined (__SGI_CC_) + // only supported by -n32 compilers + #ifndef __EDG_ABI_COMPATIBILITY_VERSION + #define wxUSE_ARRAY_MEMORY_OPERATORS 0 + #endif +#else + // ::operator new[] is a recent C++ feature, so assume it's not supported + #define wxUSE_ARRAY_MEMORY_OPERATORS 0 #endif +// Added JACS 25/11/98: needed for some compilers +void * operator new (size_t size); + void * operator new (size_t size, char * fileName, int lineNum); void operator delete (void * buf); -// VC++ 6.0 -#if _MSC_VER >= 1200 -void operator delete(void *buf, char*, int); +#if wxUSE_ARRAY_MEMORY_OPERATORS + void * operator new[] (size_t size); + void * operator new[] (size_t size, char * fileName, int lineNum); + void operator delete[] (void * buf); #endif -#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) ) -void * operator new[] (size_t size, char * fileName, int lineNum); -void operator delete[] (void * buf); +// VC++ 6.0 +#if defined(__VISUALC__) && (__VISUALC__ >= 1200) + void operator delete(void *buf, char*, int); + void operator delete[](void *buf, char*, int); #endif #endif + // wxUSE_GLOBAL_MEMORY_OPERATORS #endif + // __WXDEBUG__ typedef unsigned int wxMarkerType; @@ -251,7 +266,7 @@ public: // Count the number of non-wxDebugContext-related objects // that are outstanding - static int CountObjectsLeft(void); + static int CountObjectsLeft(bool sinceCheckpoint = FALSE); private: // Store these here to allow access to the list without @@ -264,14 +279,14 @@ private: static bool m_checkPrevious; }; -// Output a debug mess., in a system dependent fashion. +// Output a debug message, in a system dependent fashion. void WXDLLEXPORT wxTrace(const char *fmt ...); void WXDLLEXPORT wxTraceLevel(int level, const char *fmt ...); #define WXTRACE wxTrace #define WXTRACELEVEL wxTraceLevel -#else // else part for the #if WXDEBUG +#else // else part for the #if __WXDEBUG__ inline void wxTrace(const char *WXUNUSED(fmt)) {} inline void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt)) {}