Triued in vain to fix threads segvs with gcc

[wxWidgets.git] / include / wx / memory.h

diff --git a/include/wx/memory.h b/include/wx/memory.h
index 4a4117e410b4ce97044673203fe69dc10700de67..8f4d7a1270f7e64b0eff855751b1f1fd59b7a7c4 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -23,7 +23,7 @@
   info, or to be a straight call to the new operator.
 */
 
   info, or to be a straight call to the new operator.
 */
 

-#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT

 
 #include <stddef.h>
 
 
 #include <stddef.h>
 


@@ -39,36 +39,47 @@
 
 #include "wx/string.h"
 
 
 #include "wx/string.h"
 

-#if WXDEBUG
-
-// #ifndef WXDEBUG_NEW
-// #define WXDEBUG_NEW new(__FILE__,__LINE__)
-// #endif
+#ifdef __WXDEBUG__

 
 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.
 
 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 wxUSE_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
 #endif
 
 #ifdef new
 #undef new
 #endif
 

+#if defined(__SUNCC__)
+#define wxUSE_ARRAY_MEMORY_OPERATORS 0
+#elif !( defined (_MSC_VER) && (_MSC_VER <= 1020) ) || defined( __MWERKS__)
+#define wxUSE_ARRAY_MEMORY_OPERATORS 1
+#else
+#define wxUSE_ARRAY_MEMORY_OPERATORS 0
+#endif
+
+// Added JACS 25/11/98: needed for some compilers
+void * operator new (size_t size);
+
+#if wxUSE_ARRAY_MEMORY_OPERATORS
+void * operator new[] (size_t size);
+#endif
+

 void * operator new (size_t size, char * fileName, int lineNum);
 void operator delete (void * buf);
 
 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, char * fileName, int lineNum);
+void operator delete[] (void * buf);
+#endif
+

 // VC++ 6.0
 #if _MSC_VER >= 1200
 void operator delete(void *buf, char*, int);
 // VC++ 6.0
 #if _MSC_VER >= 1200
 void operator delete(void *buf, char*, int);

-#endif
-
-#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) )
-void * operator new[] (size_t size, char * fileName, int lineNum);
-void operator delete[] (void * buf);
+void operator delete[](void *buf, char*, int);

 #endif
 
 #endif
 #endif
 
 #endif


@@ -251,7 +262,7 @@ public:
 
     // Count the number of non-wxDebugContext-related objects
     // that are outstanding
 
     // 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
 
 private:
     // Store these here to allow access to the list without


@@ -264,14 +275,14 @@ private:
     static bool                 m_checkPrevious;
 };
 
     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
 
 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 WXDEBUG
+#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 char *WXUNUSED(fmt)) {}
 inline void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt)) {}


@@ -280,7 +291,7 @@ inline void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt)) {}
 #define WXTRACELEVEL TRUE ? (void)0 : wxTraceLevel
 // #define WXDEBUG_NEW new
 
 #define WXTRACELEVEL TRUE ? (void)0 : wxTraceLevel
 // #define WXDEBUG_NEW new
 

-#endif // WXDEBUG
+#endif // __WXDEBUG__

 
 #endif
     // _WX_MEMORYH__
 
 #endif
     // _WX_MEMORYH__