X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ba6f401d4580852928cb1e5b4fd0bfd1aacb9e25..b6e5eaa59701315ca06996ff845872ca4122695f:/include/wx/memory.h diff --git a/include/wx/memory.h b/include/wx/memory.h index 23f64dca35..e676282b7a 100644 --- a/include/wx/memory.h +++ b/include/wx/memory.h @@ -28,22 +28,37 @@ #include +// Obsolete +#if 0 #if wxUSE_IOSTREAMH // N.B. BC++ doesn't have istream.h, ostream.h # include #else -# include +# include # if defined(__VISUALC__) || defined(__MWERKS__) - using namespace std; +// using namespace std; # endif #endif +#endif #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 @@ -61,33 +76,60 @@ void wxDebugFree(void * buf, bool isVect = FALSE); #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 -// Added JACS 25/11/98: needed for some compilers -void * operator new (size_t size); +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); +} -void * operator new (size_t size, char * fileName, int lineNum); -void operator delete (void * buf); +inline void operator delete (void * buf) +{ + wxDebugFree(buf, FALSE); +} #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); +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 defined(__VISUALC__) && (__VISUALC__ >= 1200) - void operator delete(void *buf, char*, int); - void operator delete[](void *buf, char*, int); -#endif +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 - // wxUSE_GLOBAL_MEMORY_OPERATORS -#endif - // __WXDEBUG__ +//********************************************************************************** typedef unsigned int wxMarkerType; @@ -142,7 +184,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. @@ -188,12 +230,17 @@ protected: // Traverse the list. static void TraverseList (PmSFV, wxMemStruct *from = NULL); - static streambuf *m_streamBuf; - static ostream *m_debugStream; + // Obsolete +#if 0 + static wxSTD streambuf *m_streamBuf; + static wxSTD ostream *m_debugStream; +#endif 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,12 +249,15 @@ public: wxDebugContext(void); ~wxDebugContext(void); + // Obsolete +#if 0 static bool HasStream(void) { return (m_debugStream != NULL); }; - static ostream& GetStream(void) { return *m_debugStream; } - static streambuf *GetStreamBuf(void) { return m_streamBuf; } - static void SetStream(ostream *stream, streambuf *buf = NULL); + static wxSTD ostream& GetStream(void) { return *m_debugStream; } + static wxSTD streambuf *GetStreamBuf(void) { return m_streamBuf; } + static void SetStream(wxSTD ostream *stream, wxSTD streambuf *buf = NULL); static bool SetFile(const wxString& file); static bool SetStandardError(void); +#endif static int GetLevel(void) { return debugLevel; } static void SetLevel(int level) { debugLevel = level; } @@ -217,7 +267,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); @@ -280,16 +330,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