X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/862bb5c73a2577e356f2fece32f55d785c79e517..51623cc53f350935337e57930eaaf1afe9a48c3b:/include/wx/memory.h?ds=inline diff --git a/include/wx/memory.h b/include/wx/memory.h index 23b1a01ef0..333b937436 100644 --- a/include/wx/memory.h +++ b/include/wx/memory.h @@ -9,24 +9,17 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_MEMORYH__ -#define _WX_MEMORYH__ +#ifndef _WX_MEMORY_H_ +#define _WX_MEMORY_H_ #include "wx/defs.h" #include "wx/string.h" #include "wx/msgout.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 (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT +#if wxUSE_MEMORY_TRACING || wxUSE_DEBUG_CONTEXT #include -#ifdef __WXDEBUG__ - 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); @@ -50,14 +43,14 @@ WXDLLIMPEXP_BASE void wxDebugFree(void * buf, bool isVect = false); #if defined(__SUNCC__) #define wxUSE_ARRAY_MEMORY_OPERATORS 0 -#elif !( defined (__VISUALC__) && (__VISUALC__ <= 1020) ) || defined( __MWERKS__) +#elif !( defined (__VISUALC__) && (__VISUALC__ <= 1020) ) #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 -#elif !( defined (__VISUALC__) && (__VISUALC__ <= 1020) ) || defined( __MWERKS__) +#elif !( defined (__VISUALC__) && (__VISUALC__ <= 1020) ) #define wxUSE_ARRAY_MEMORY_OPERATORS 1 #else // ::operator new[] is a recent C++ feature, so assume it's not supported @@ -67,7 +60,7 @@ WXDLLIMPEXP_BASE void wxDebugFree(void * buf, bool isVect = false); // 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 -#if defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)) +#if defined(__WINDOWS__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)) inline void * operator new (size_t size, wxChar * fileName, int lineNum) { return wxDebugAlloc(size, fileName, lineNum, false, false); @@ -115,10 +108,10 @@ void * operator new[] (size_t size, wxChar * fileName, int lineNum); void operator delete[] (void * buf); #endif // wxUSE_ARRAY_MEMORY_OPERATORS -#endif // defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)) +#endif // defined(__WINDOWS__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)) -// VC++ 6.0 and MWERKS -#if ( defined(__VISUALC__) && (__VISUALC__ >= 1200) ) || defined(__MWERKS__) +// VC++ 6.0 +#if ( defined(__VISUALC__) && (__VISUALC__ >= 1200) ) inline void operator delete(void* pData, wxChar* /* fileName */, int /* lineNum */) { wxDebugFree(pData, false); @@ -129,7 +122,6 @@ inline void operator delete[](void* pData, wxChar* /* fileName */, int /* lineNu } #endif // __VISUALC__>=1200 #endif // wxUSE_GLOBAL_MEMORY_OPERATORS -#endif // __WXDEBUG__ //********************************************************************************** @@ -357,7 +349,7 @@ void WXDLLIMPEXP_BASE wxTraceLevel(int level, const wxChar *fmt ...) WX_ATTRIBUT #define WXTRACE wxTrace #define WXTRACELEVEL wxTraceLevel -#else // (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT +#else // wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT #define WXDEBUG_DUMPDELAYCOUNTER @@ -374,7 +366,6 @@ void WXDLLIMPEXP_BASE wxTraceLevel(int level, const wxChar *fmt ...) WX_ATTRIBUT #define WXTRACE true ? (void)0 : wxTrace #define WXTRACELEVEL true ? (void)0 : wxTraceLevel -#endif // (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT +#endif // wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT -#endif - // _WX_MEMORYH__ +#endif // _WX_MEMORY_H_