summaryrefslogtreecommitdiff
path: root/Ivy
diff options
context:
space:
mode:
authorfcolin2007-02-01 13:02:46 +0000
committerfcolin2007-02-01 13:02:46 +0000
commita793429d90412587a0e7b493d177272774fd81c1 (patch)
treedb7c1702aaaeb9374423e1093951e9b1c9ec7ada /Ivy
parent0932419feeffc111b28762c490adfd6054f372e3 (diff)
downloadivy-cplusplus-a793429d90412587a0e7b493d177272774fd81c1.zip
ivy-cplusplus-a793429d90412587a0e7b493d177272774fd81c1.tar.gz
ivy-cplusplus-a793429d90412587a0e7b493d177272774fd81c1.tar.bz2
ivy-cplusplus-a793429d90412587a0e7b493d177272774fd81c1.tar.xz
Utilisateur : Fcolin Date : 20/02/01 Heure : 10:52 Archivé dans $/Ivy (vss 10)
Diffstat (limited to 'Ivy')
-rw-r--r--Ivy/IvyStdAfx.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/Ivy/IvyStdAfx.h b/Ivy/IvyStdAfx.h
index 9bb291c..e335332 100644
--- a/Ivy/IvyStdAfx.h
+++ b/Ivy/IvyStdAfx.h
@@ -91,8 +91,10 @@ void DebugTrace ( const char *fmt , ... );
#endif
#if defined( WIN32 ) && (!defined(UNDER_CE))
-#include <crtdbg.h>
+#include <crtdbg.h>
+#ifndef DEBUG_NEW_OP
+#define DEBUG_NEW_OP
inline void* __cdecl operator new(size_t nSize, const char * lpszFileName, int nLine)
{
return ::operator new(nSize, _NORMAL_BLOCK, lpszFileName, nLine);
@@ -101,5 +103,6 @@ inline void __cdecl operator delete(void *p, const char * lpszFileName, int nLin
{
::operator delete(p, _NORMAL_BLOCK, lpszFileName, nLine);
}
+#endif
#endif