diff options
| author | Shauren <shauren.trinity@gmail.com> | 2017-09-24 23:53:33 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2017-09-24 23:53:33 +0200 |
| commit | d184768bbc333af0b34e860839d71c1bd310f7e4 (patch) | |
| tree | 78063b3db2c8f4dec4d13cba692e311877cd3328 | |
| parent | 0fcf6043b7e9c4fd02f81d03bc6b8f8f036ec0c1 (diff) | |
Core/Misc: Improved error message reported by ASSERT_NOTNULL
| -rw-r--r-- | src/common/Debugging/Errors.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/common/Debugging/Errors.h b/src/common/Debugging/Errors.h index c21972af906..fbf4dddbf07 100644 --- a/src/common/Debugging/Errors.h +++ b/src/common/Debugging/Errors.h @@ -55,10 +55,13 @@ namespace Trinity #define ASSERT WPAssert #define ABORT WPAbort -template <typename T> inline T* ASSERT_NOTNULL(T* pointer) +template <typename T> +inline T* ASSERT_NOTNULL_IMPL(T* pointer, char const* expr) { - ASSERT(pointer); + ASSERT(pointer, "%s", expr); return pointer; } +#define ASSERT_NOTNULL(pointer) ASSERT_NOTNULL_IMPL(pointer, #pointer) + #endif |