diff options
| -rw-r--r-- | Ivy/IvyStdAfx.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/Ivy/IvyStdAfx.h b/Ivy/IvyStdAfx.h index b197ad7..9bb291c 100644 --- a/Ivy/IvyStdAfx.h +++ b/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
|