// 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>
#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 <ostream>
+# if defined(__VISUALC__) || defined(__MWERKS__)
+ using namespace std;
+# endif
#endif
-#include "wx/string.h"
-
#ifdef __WXDEBUG__
void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bool isVect = FALSE);
// 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);
-#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) )
-void * operator new[] (size_t size);
-#endif
-
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 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
// VC++ 6.0
-#if _MSC_VER >= 1200
-void operator delete(void *buf, char*, int);
-void operator delete[](void *buf, char*, int);
+#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;