From 7960d649075ff2ee8d74ff8d9f8745408f52b9b4 Mon Sep 17 00:00:00 2001
From: fcolin
Date: Thu, 1 Feb 2007 13:02:42 +0000
Subject:  Utilisateur : Fcolin       Date : 19/02/01   Heure : 10:37 Archivé
 dans $/Ivy (vss 8)

---
 Ivy/IvyStdAfx.h | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/Ivy/IvyStdAfx.h b/Ivy/IvyStdAfx.h
index c9ed653..b197ad7 100644
--- a/Ivy/IvyStdAfx.h
+++ b/Ivy/IvyStdAfx.h
@@ -62,37 +62,23 @@ using std::list;
 
 
 
-#ifdef WIN32
+#ifdef WIN32 
 
 #ifndef TRACE
 void DebugTrace ( const char *fmt , ... );
 #define TRACE DebugTrace
 #endif
 
-#ifndef ASSERT
-#define ASSERT(expr) \
-   do { \
-      if (! (expr) ) \
-		{\
-		TRACE( "Assert (%s) at %s:%d\n", #expr, __FILE__ ,  __LINE__ ); \
-        DebugBreak(); \
-		}\
-    } while (0)
-#endif
-#elif defined( _WIN32_WCE )
-
-
-#ifndef TRACE
-void DebugTrace ( const char *fmt , ... );
-#define TRACE DebugTrace
-#endif
+#if defined(_WIN32_WCE)
+#undef ASSERT
+#endif // _WIN32_WCE
 
 #ifndef ASSERT
 #define ASSERT(expr) \
    do { \
       if (! (expr) ) \
 		{\
-		TRACE( "Assert (%s) failed in file %s at line %d\r\n", #expr, __FILE__ ,  __LINE__ ); \
+		TRACE( "Assert (%s) failed in file %s at line %d\r\n", TEXT(#expr), __FILE__ ,  __LINE__ ); \
         DebugBreak(); \
 		}\
     } while (0)
-- 
cgit v1.1