diff options
| author | fcolin | 2007-02-01 13:02:42 +0000 |
|---|---|---|
| committer | fcolin | 2007-02-01 13:02:42 +0000 |
| commit | 2c7af0f871358005d6f47f9ddb8ab26578a31268 (patch) | |
| tree | 7b6f0bbd7a83833122e520db2cae3b18ef90f58c | |
| parent | 37049bc548b4cf7a646d16d7933930bf91c6ea73 (diff) | |
| download | ivy-cplusplus-2c7af0f871358005d6f47f9ddb8ab26578a31268.zip ivy-cplusplus-2c7af0f871358005d6f47f9ddb8ab26578a31268.tar.gz ivy-cplusplus-2c7af0f871358005d6f47f9ddb8ab26578a31268.tar.bz2 ivy-cplusplus-2c7af0f871358005d6f47f9ddb8ab26578a31268.tar.xz | |
Utilisateur : Fcolin Date : 19/02/01 Heure : 10:37 Archivé dans $/Ivy (vss 8)
| -rw-r--r-- | Bus/Ivy/IvyStdAfx.h | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/Bus/Ivy/IvyStdAfx.h b/Bus/Ivy/IvyStdAfx.h index c9ed653..b197ad7 100644 --- a/Bus/Ivy/IvyStdAfx.h +++ b/Bus/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)
|