X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4fabb57533169f2f75367e0d120c762518548890..2e907fab47d506f5c8096b4a7675d9bd4216320e:/include/wx/memory.h diff --git a/include/wx/memory.h b/include/wx/memory.h index c6ee00a4e0..92f28769ac 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,104 @@ #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__ -void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bool isVect = FALSE); -void wxDebugFree(void * buf, bool isVect = FALSE); +// devik 2000-8-27: export these because new/delete operators are now inline +WXDLLEXPORT void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool isVect = FALSE); +WXDLLEXPORT void wxDebugFree(void * buf, bool isVect = FALSE); + +//********************************************************************************** +/* + The global operator new used for everything apart from getting + dynamic storage within this function itself. +*/ + +// We'll only do malloc and free for the moment: leave the interesting +// stuff for the wxObject versions. +// devik 2000-8-29: All new/delete ops are now inline because they can't +// be marked as dllexport/dllimport. It then leads to weird bugs when +// used on MSW as DLL -// Global versions of the new and delete operators. #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 -// Added JACS 25/11/98: needed for some compilers -void * operator new (size_t size); -void * operator new[] (size_t size); - -void * operator new (size_t size, char * fileName, int lineNum); -void operator delete (void * buf); +#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 +#elif !( defined (__VISUALC__) && (__VISUALC__ <= 1020) ) || defined( __MWERKS__) + #define wxUSE_ARRAY_MEMORY_OPERATORS 1 +#else + // ::operator new[] is a recent C++ feature, so assume it's not supported + #define wxUSE_ARRAY_MEMORY_OPERATORS 0 +#endif -#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) ) -void * operator new[] (size_t size, char * fileName, int lineNum); -void operator delete[] (void * buf); +inline void * operator new (size_t size, wxChar * fileName, int lineNum) +{ + return wxDebugAlloc(size, fileName, lineNum, FALSE, FALSE); +} + +inline void * operator new (size_t size) +{ + return wxDebugAlloc(size, NULL, 0, FALSE); +} + +inline void operator delete (void * buf) +{ + wxDebugFree(buf, FALSE); +} + +#if wxUSE_ARRAY_MEMORY_OPERATORS +inline void * operator new[] (size_t size) +{ + return wxDebugAlloc(size, NULL, 0, FALSE, TRUE); +} + +inline void * operator new[] (size_t size, wxChar * fileName, int lineNum) +{ + return wxDebugAlloc(size, fileName, lineNum, FALSE, TRUE); +} + +inline void operator delete[] (void * buf) +{ + wxDebugFree(buf, TRUE); +} #endif // VC++ 6.0 -#if _MSC_VER >= 1200 -void operator delete(void *buf, char*, int); -void operator delete[](void *buf, char*, int); -#endif +#if defined(__VISUALC__) && (__VISUALC__ >= 1200) +inline void operator delete(void* pData, wxChar* /* fileName */, int /* lineNum */) +{ + wxDebugFree(pData, FALSE); +} +inline void operator delete[](void* pData, wxChar* /* fileName */, int /* lineNum */) +{ + wxDebugFree(pData, TRUE); +} +#endif // __VISUALC__>=1200 +#endif // wxUSE_GLOBAL_MEMORY_OPERATORS +#endif // __WXDEBUG__ -#endif -#endif +//********************************************************************************** typedef unsigned int wxMarkerType; @@ -127,7 +181,7 @@ public: wxMarkerType m_firstMarker; // File name and line number are from cpp. - char* m_fileName; + wxChar* m_fileName; int m_lineNum; // The amount of memory requested by the caller. @@ -179,6 +233,8 @@ protected: static int debugLevel; static bool debugOn; + static int m_balign; // byte alignment + static int m_balignmask; // mask for performing byte alignment public: // Set a checkpoint to dump only the memory from // a given point @@ -202,7 +258,7 @@ public: static void SetCheckpoint(bool all = FALSE); static wxMemStruct *GetCheckpoint(void) { return checkPoint; } - + // Calculated from the request size and any padding needed // before the final marker. static size_t PaddedSize (const size_t reqSize); @@ -265,16 +321,16 @@ private: }; // Output a debug message, in a system dependent fashion. -void WXDLLEXPORT wxTrace(const char *fmt ...); -void WXDLLEXPORT wxTraceLevel(int level, const char *fmt ...); +void WXDLLEXPORT wxTrace(const wxChar *fmt ...); +void WXDLLEXPORT wxTraceLevel(int level, const wxChar *fmt ...); #define WXTRACE wxTrace #define WXTRACELEVEL wxTraceLevel #else // else part for the #if __WXDEBUG__ -inline void wxTrace(const char *WXUNUSED(fmt)) {} -inline void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt)) {} +inline void wxTrace(const wxChar *WXUNUSED(fmt)) {} +inline void wxTraceLevel(int WXUNUSED(level), const wxChar *WXUNUSED(fmt)) {} #define WXTRACE TRUE ? (void)0 : wxTrace #define WXTRACELEVEL TRUE ? (void)0 : wxTraceLevel