aboutsummaryrefslogtreecommitdiff
path: root/src/common/Debugging/Errors.h
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2017-09-24 23:53:33 +0200
committerjackpoz <giacomopoz@gmail.com>2019-02-16 17:26:57 +0100
commitcd6d57e2e7103d4dd822ca8a4ea888cf10c2d2a6 (patch)
tree4fd9c69d0d11bdee66924ed644ae5fbb9dbe32b4 /src/common/Debugging/Errors.h
parent78f70cbff22d18ca87d66ebb2f6e85eb58b0d780 (diff)
Core/Misc: Improved error message reported by ASSERT_NOTNULL
(cherry picked from commit d184768bbc333af0b34e860839d71c1bd310f7e4)
Diffstat (limited to 'src/common/Debugging/Errors.h')
-rw-r--r--src/common/Debugging/Errors.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/common/Debugging/Errors.h b/src/common/Debugging/Errors.h
index 428e7653db2..d263be3efed 100644
--- a/src/common/Debugging/Errors.h
+++ b/src/common/Debugging/Errors.h
@@ -70,10 +70,13 @@ TC_COMMON_API std::string GetDebugInfo();
#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