Partial Watcom C++ 10.6 support added (doesn't link for some reason)

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

diff --git a/include/wx/memory.h b/include/wx/memory.h
index 9cfff090e031f4c970be53441ba3553fb0896f83..8f4d7a1270f7e64b0eff855751b1f1fd59b7a7c4 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -53,17 +53,33 @@ void wxDebugFree(void * buf, bool isVect = FALSE);
 #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);
 
+#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);
-#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
@@ -246,7 +262,7 @@ public:
 
     // 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