// Created: 29/01/98
// RCS-ID: $Id$
// Copyright: (c) 1998 Julian Smart
-// Licence: wxWindows license
+// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_MEMORYH__
#endif
#include "wx/defs.h"
+#include "wx/string.h"
/*
The macro which will be expanded to include the file and line number
#include <stddef.h>
+// Obsolete
+#if 0
#if wxUSE_IOSTREAMH
-// N.B. BC++ doesn't have istream.h, ostream.h
-# include <iostream.h>
+ // N.B. BC++ doesn't have istream.h, ostream.h
+# include <iostream.h>
#else
-# include <ostream>
-# ifdef _MSC_VER
- using namespace std;
-# endif
+# include <iostream>
+# if defined(__VISUALC__) || defined(__MWERKS__)
+// using namespace std;
+# endif
+#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 (_MSC_VER) && (_MSC_VER <= 1020) )
-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
-// VC++ 6.0
-#if _MSC_VER >= 1200
-void operator delete(void *buf, char*, int);
-void operator delete[](void *buf, char*, int);
+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
-#endif
-#endif
+// VC++ 6.0 and MWERKS
+#if ( defined(__VISUALC__) && (__VISUALC__ >= 1200) ) || defined(__MWERKS__)
+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__
+
+//**********************************************************************************
typedef unsigned int wxMarkerType;
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.
// 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
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; }
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);
// 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
};
// 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 ...) ATTRIBUTE_PRINTF_1;
+void WXDLLEXPORT wxTraceLevel(int level, const wxChar *fmt ...) ATTRIBUTE_PRINTF_2;
#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
projects / wxWidgets.git / blobdiff