diff options
| author | fcolin | 2007-02-01 13:02:44 +0000 |
|---|---|---|
| committer | fcolin | 2007-02-01 13:02:44 +0000 |
| commit | 5b00082818fc1c2123f19ffd8fad0cb2b9c5e2a4 (patch) | |
| tree | 3d3bba0fdada79405a22169368ea9ee58e85515f /Bus/Ivy | |
| parent | 2c7af0f871358005d6f47f9ddb8ab26578a31268 (diff) | |
| download | ivy-cplusplus-5b00082818fc1c2123f19ffd8fad0cb2b9c5e2a4.zip ivy-cplusplus-5b00082818fc1c2123f19ffd8fad0cb2b9c5e2a4.tar.gz ivy-cplusplus-5b00082818fc1c2123f19ffd8fad0cb2b9c5e2a4.tar.bz2 ivy-cplusplus-5b00082818fc1c2123f19ffd8fad0cb2b9c5e2a4.tar.xz | |
Utilisateur : Fcolin Date : 20/02/01 Heure : 10:27 Archivé dans $/Ivy (vss 9)
Diffstat (limited to 'Bus/Ivy')
| -rw-r--r-- | Bus/Ivy/IvyStdAfx.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/Bus/Ivy/IvyStdAfx.h b/Bus/Ivy/IvyStdAfx.h index b197ad7..9bb291c 100644 --- a/Bus/Ivy/IvyStdAfx.h +++ b/Bus/Ivy/IvyStdAfx.h @@ -46,7 +46,7 @@ struct ip_mreq { #endif
#ifndef UNDER_CE
-//#define STL
+#define STL
#endif
#ifdef STL
#include <string>
@@ -90,9 +90,16 @@ void DebugTrace ( const char *fmt , ... ); #define ASSERT(expr) assert( expr )
#endif
-#ifdef WIN32
+#if defined( WIN32 ) && (!defined(UNDER_CE))
+#include <crtdbg.h>
-void* __cdecl operator new(size_t nSize, const char * lpszFileName, int nLine);
-void __cdecl operator delete(void *p, const char * lpszFileName, int nLine);
+inline void* __cdecl operator new(size_t nSize, const char * lpszFileName, int nLine)
+ {
+ return ::operator new(nSize, _NORMAL_BLOCK, lpszFileName, nLine);
+ }
+inline void __cdecl operator delete(void *p, const char * lpszFileName, int nLine)
+ {
+ ::operator delete(p, _NORMAL_BLOCK, lpszFileName, nLine);
+ }
-#endif
\ No newline at end of file +#endif
|