// Created: 29/01/98
// RCS-ID: $Id$
// Copyright: (c) 1998 Julian Smart
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_MEMORYH__
#define _WX_MEMORYH__
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "memory.h"
#endif
#include <stddef.h>
-#if wxUSE_IOSTREAMH
- // N.B. BC++ doesn't have istream.h, ostream.h
-# include <iostream.h>
-#else
-# include <ostream>
-# if defined(__VISUALC__) || defined(__MWERKS__)
- using namespace std;
-# endif
-#endif
-
#ifdef __WXDEBUG__
-void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool isVect = FALSE);
-void wxDebugFree(void * buf, bool isVect = FALSE);
+WXDLLIMPEXP_BASE void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool isVect = FALSE);
+WXDLLIMPEXP_BASE 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
#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);
-WXDLLEXPORT void * operator new (size_t size, wxChar * fileName, int lineNum);
+inline void * operator new (size_t size, wxChar * fileName, int lineNum)
+{
+ return wxDebugAlloc(size, fileName, lineNum, FALSE, FALSE);
+}
-#if !defined(__VISAGECPP__)
-void operator delete (void * buf);
-#endif
+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
- WXDLLEXPORT void* operator new[] (size_t size);
- WXDLLEXPORT void* operator new[] (size_t size, wxChar * fileName, int lineNum);
- WXDLLEXPORT 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)
- WXDLLEXPORT void operator delete(void *buf, wxChar*, int);
- WXDLLEXPORT void operator delete[](void *buf, wxChar*, int);
-#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__
-#endif
- // wxUSE_GLOBAL_MEMORY_OPERATORS
-#endif
- // __WXDEBUG__
+//**********************************************************************************
typedef unsigned int wxMarkerType;
allocated memory.
*/
-class WXDLLEXPORT wxMemStruct {
+class WXDLLIMPEXP_BASE wxMemStruct {
-friend class WXDLLEXPORT wxDebugContext; // access to the m_next pointer for list traversal.
+friend class WXDLLIMPEXP_BASE wxDebugContext; // access to the m_next pointer for list traversal.
public:
public:
/*
- Debugging class. This will only have a single instance, but it\'s
+ Debugging class. This will only have a single instance, but it's
a reasonable way to keep everything together and to make this
available for change if needed by someone else.
A lot of this stuff would be better off within the wxMemStruct class, but
- it\'s stuff which we need to access at times when there is no wxMemStruct
+ it's stuff which we need to access at times when there is no wxMemStruct
object so we use this class instead. Think of it as a collection of
globals which have to do with the wxMemStruct class.
*/
-class WXDLLEXPORT wxDebugContext {
+class WXDLLIMPEXP_BASE wxDebugContext {
protected:
// Used to set alignment for markers.
// Traverse the list.
static void TraverseList (PmSFV, wxMemStruct *from = NULL);
- static streambuf *m_streamBuf;
- static ostream *m_debugStream;
-
static int debugLevel;
static bool debugOn;
- static int m_balign; // byte alignment
- static int m_balignmask; // mask for performing byte alignment
+ 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);
- 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 bool SetFile(const wxString& file);
- static bool SetStandardError(void);
-
static int GetLevel(void) { return debugLevel; }
static void SetLevel(int level) { debugLevel = level; }
};
// Output a debug message, in a system dependent fashion.
-void WXDLLEXPORT wxTrace(const wxChar *fmt ...);
-void WXDLLEXPORT wxTraceLevel(int level, const wxChar *fmt ...);
+void WXDLLIMPEXP_BASE wxTrace(const wxChar *fmt ...) ATTRIBUTE_PRINTF_1;
+void WXDLLIMPEXP_BASE wxTraceLevel(int level, const wxChar *fmt ...) ATTRIBUTE_PRINTF_2;
#define WXTRACE wxTrace
#define WXTRACELEVEL wxTraceLevel
#define WXTRACE TRUE ? (void)0 : wxTrace
#define WXTRACELEVEL TRUE ? (void)0 : wxTraceLevel
-// #define WXDEBUG_NEW new
#endif // __WXDEBUG__
projects / wxWidgets.git / blobdiff