From 5b00082818fc1c2123f19ffd8fad0cb2b9c5e2a4 Mon Sep 17 00:00:00 2001
From: fcolin
Date: Thu, 1 Feb 2007 13:02:44 +0000
Subject:  Utilisateur : Fcolin       Date : 20/02/01   Heure : 10:27 Archivé
 dans $/Ivy (vss 9)

---
 Bus/Ivy/IvyStdAfx.h | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'Bus/Ivy/IvyStdAfx.h')

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
-- 
cgit v1.1