From 7ce6dfceeb0a9d7a82c1f741fadda8b06456e0a0 Mon Sep 17 00:00:00 2001 From: Vincent Munsch Date: Sun, 1 Jun 2014 10:45:25 +0200 Subject: [PATCH] make hsAssert variadic (to allow printf like error message) --- Sources/Plasma/CoreLib/HeadSpin.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Sources/Plasma/CoreLib/HeadSpin.h b/Sources/Plasma/CoreLib/HeadSpin.h index f14cabc6..63ef7e6f 100644 --- a/Sources/Plasma/CoreLib/HeadSpin.h +++ b/Sources/Plasma/CoreLib/HeadSpin.h @@ -472,10 +472,10 @@ void DebugMsg(const char* fmt, ...); void hsDebugMessage(const char* message, long refcon); #define hsDebugCode(code) code #define hsIfDebugMessage(expr, msg, ref) (void)( ((expr) != 0) || (hsDebugMessage(msg, ref), 0) ) - #define hsAssert(expr, msg) (void)( ((expr) != 0) || (ErrorAssert(__LINE__, __FILE__, msg), 0) ) + #define hsAssert(expr, ...) (void)( ((expr) != 0) || (ErrorAssert(__LINE__, __FILE__, __VA_ARGS__), 0) ) #define ASSERT(expr) (void)( ((expr) != 0) || (ErrorAssert(__LINE__, __FILE__, #expr), 0) ) - #define ASSERTMSG(expr, msg) (void)( ((expr) != 0) || (ErrorAssert(__LINE__, __FILE__, msg), 0) ) - #define FATAL(msg) ErrorAssert(__LINE__, __FILE__, msg) + #define ASSERTMSG(expr, ...) (void)( ((expr) != 0) || (ErrorAssert(__LINE__, __FILE__, __VA_ARGS__), 0) ) + #define FATAL(...) ErrorAssert(__LINE__, __FILE__, __VA_ARGS__) #define DEBUG_MSG DebugMsg #define DEBUG_BREAK_IF_DEBUGGER_PRESENT DebugBreakIfDebuggerPresent @@ -484,10 +484,10 @@ void DebugMsg(const char* fmt, ...); #define hsDebugMessage(message, refcon) NULL_STMT #define hsDebugCode(code) /* empty */ #define hsIfDebugMessage(expr, msg, ref) NULL_STMT - #define hsAssert(expr, msg) NULL_STMT + #define hsAssert(expr, ...) NULL_STMT #define ASSERT(expr) NULL_STMT - #define ASSERTMSG(expr, msg) NULL_STMT - #define FATAL(msg) NULL_STMT + #define ASSERTMSG(expr, ...) NULL_STMT + #define FATAL(...) NULL_STMT #define DEBUG_MSG (void) #define DEBUG_MSGV NULL_STMT #define DEBUG_BREAK_IF_DEBUGGER_PRESENT NULL_STMT