diff options
| author | megamage <none@none> | 2009-05-27 16:37:03 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-05-27 16:37:03 -0500 |
| commit | 35ba3ca6538256c41a0961016e9d67a51ca9b7ee (patch) | |
| tree | 49f86437e10494671ce78559e22d3371ea77736b /src | |
| parent | 5101c7c4c5b0a6781e6bb172b963315e007edc54 (diff) | |
[7897] Include function name in assertion fail output. Author: Ambal
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/shared/Errors.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/shared/Errors.h b/src/shared/Errors.h index b7bd19a1d94..596e19627d9 100644 --- a/src/shared/Errors.h +++ b/src/shared/Errors.h @@ -21,11 +21,11 @@ #ifndef TRINITYCORE_ERRORS_H #define TRINITYCORE_ERRORS_H -#define WPAssert( assertion ) { if( !(assertion) ) { fprintf( stderr, "\n%s:%i ASSERTION FAILED:\n %s\n", __FILE__, __LINE__, #assertion ); assert( #assertion &&0 ); } } -#define WPError( assertion, errmsg ) if( ! (assertion) ) { sLog.outError( "%s:%i ERROR:\n %s\n", __FILE__, __LINE__, (char *)errmsg ); assert( false ); } -#define WPWarning( assertion, errmsg ) if( ! (assertion) ) { sLog.outError( "%s:%i WARNING:\n %s\n", __FILE__, __LINE__, (char *)errmsg ); } +#define WPAssert( assertion ) { if( !(assertion) ) { fprintf( stderr, "\n%s:%i in %s ASSERTION FAILED:\n %s\n", __FILE__, __LINE__,__FUNCTION__, #assertion ); assert( #assertion &&0 ); } } +#define WPError( assertion, errmsg ) if( ! (assertion) ) { sLog.outError( "%\n%s:%i in %s ERROR:\n %s\n", __FILE__, __LINE__, __FUNCTION__, (char *)errmsg ); assert( false ); } +#define WPWarning( assertion, errmsg ) if( ! (assertion) ) { sLog.outError( "\n%s:%i in %s WARNING:\n %s\n", __FILE__, __LINE__, __FUNCTION__, (char *)errmsg ); } -#define WPFatal( assertion, errmsg ) if( ! (assertion) ) { sLog.outError( "%s:%i FATAL ERROR:\n %s\n", __FILE__, __LINE__, (char *)errmsg ); assert( #assertion &&0 ); abort(); } +#define WPFatal( assertion, errmsg ) if( ! (assertion) ) { sLog.outError( "\n%s:%i in %s FATAL ERROR:\n %s\n", __FILE__, __LINE__, __FUNCTION__, (char *)errmsg ); assert( #assertion &&0 ); abort(); } #define ASSERT WPAssert #endif |