From cd6d57e2e7103d4dd822ca8a4ea888cf10c2d2a6 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Sun, 24 Sep 2017 23:53:33 +0200
Subject: Core/Misc: Improved error message reported by ASSERT_NOTNULL

(cherry picked from commit d184768bbc333af0b34e860839d71c1bd310f7e4)
---
 src/common/Debugging/Errors.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src')

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
-- 
cgit v1.2.3