// Created: 29/01/98
// RCS-ID: $Id$
// Copyright: (c) 1998 Julian Smart
-// Licence: wxWindows license
+// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
-#ifndef __MEMORYH__
-#define __MEMORYH__
+#ifndef _WX_MEMORYH__
+#define _WX_MEMORYH__
#ifdef __GNUG__
#pragma interface "memory.h"
#endif
#include "wx/defs.h"
+#include "wx/string.h"
/*
The macro which will be expanded to include the file and line number
info, or to be a straight call to the new operator.
*/
-#if (DEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
+#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
#include <stddef.h>
-#if USE_IOSTREAMH
-#include <iostream.h>
+#if wxUSE_IOSTREAMH
+ // N.B. BC++ doesn't have istream.h, ostream.h
+# include <iostream.h>
#else
-#include <iostream>
+# include <ostream>
+# 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
-
-#if DEBUG
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 USE_GLOBAL_MEMORY_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
+#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);
-#if !( defined (_MSC_VER) && (_MSC_VER <= 1000) )
-void * operator new[] (size_t size, char * fileName, int lineNum);
-void operator delete[] (void * buf);
+#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
-#define new WXDEBUG_NEW
+// 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;
// 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
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 DEBUG
+#else // else part for the #if __WXDEBUG__
inline void wxTrace(const char *WXUNUSED(fmt)) {}
inline void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt)) {}
#define WXTRACE TRUE ? (void)0 : wxTrace
#define WXTRACELEVEL TRUE ? (void)0 : wxTraceLevel
-#define WXDEBUG_NEW new
+// #define WXDEBUG_NEW new
-#endif // DEBUG
+#endif // __WXDEBUG__
#endif
- // __MEMORYH__
+ // _WX_MEMORYH__