summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfcolin2007-02-01 13:02:46 +0000
committerfcolin2007-02-01 13:02:46 +0000
commita68b5a80b7fccb7dc6fe2cbb03a906f36f1cb8de (patch)
tree164165434e812ac787dfa42533cc2a204f721041
parent5b00082818fc1c2123f19ffd8fad0cb2b9c5e2a4 (diff)
downloadivy-cplusplus-a68b5a80b7fccb7dc6fe2cbb03a906f36f1cb8de.zip
ivy-cplusplus-a68b5a80b7fccb7dc6fe2cbb03a906f36f1cb8de.tar.gz
ivy-cplusplus-a68b5a80b7fccb7dc6fe2cbb03a906f36f1cb8de.tar.bz2
ivy-cplusplus-a68b5a80b7fccb7dc6fe2cbb03a906f36f1cb8de.tar.xz
Utilisateur : Fcolin Date : 20/02/01 Heure : 10:52 Archivé dans $/Ivy (vss 10)
-rw-r--r--Bus/Ivy/IvyStdAfx.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/Bus/Ivy/IvyStdAfx.h b/Bus/Ivy/IvyStdAfx.h
index 9bb291c..e335332 100644
--- a/Bus/Ivy/IvyStdAfx.h
+++ b/Bus/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