Browse Source

Merge pull request #435 from v1nc3ntm/macro

make hsAssert variadic (to allow printf-like message)
Michael Hansen 10 years ago
parent
commit
913797dba5
  1. 12
      Sources/Plasma/CoreLib/HeadSpin.h

12
Sources/Plasma/CoreLib/HeadSpin.h

@ -384,10 +384,10 @@ void DebugMsg(const char* fmt, ...);
void hsDebugMessage(const char* message, long refcon); void hsDebugMessage(const char* message, long refcon);
#define hsDebugCode(code) code #define hsDebugCode(code) code
#define hsIfDebugMessage(expr, msg, ref) (void)( ((expr) != 0) || (hsDebugMessage(msg, ref), 0) ) #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 ASSERT(expr) (void)( ((expr) != 0) || (ErrorAssert(__LINE__, __FILE__, #expr), 0) )
#define ASSERTMSG(expr, msg) (void)( ((expr) != 0) || (ErrorAssert(__LINE__, __FILE__, msg), 0) ) #define ASSERTMSG(expr, ...) (void)( ((expr) != 0) || (ErrorAssert(__LINE__, __FILE__, __VA_ARGS__), 0) )
#define FATAL(msg) ErrorAssert(__LINE__, __FILE__, msg) #define FATAL(...) ErrorAssert(__LINE__, __FILE__, __VA_ARGS__)
#define DEBUG_MSG DebugMsg #define DEBUG_MSG DebugMsg
#define DEBUG_BREAK_IF_DEBUGGER_PRESENT DebugBreakIfDebuggerPresent #define DEBUG_BREAK_IF_DEBUGGER_PRESENT DebugBreakIfDebuggerPresent
@ -396,10 +396,10 @@ void DebugMsg(const char* fmt, ...);
#define hsDebugMessage(message, refcon) NULL_STMT #define hsDebugMessage(message, refcon) NULL_STMT
#define hsDebugCode(code) /* empty */ #define hsDebugCode(code) /* empty */
#define hsIfDebugMessage(expr, msg, ref) NULL_STMT #define hsIfDebugMessage(expr, msg, ref) NULL_STMT
#define hsAssert(expr, msg) NULL_STMT #define hsAssert(expr, ...) NULL_STMT
#define ASSERT(expr) NULL_STMT #define ASSERT(expr) NULL_STMT
#define ASSERTMSG(expr, msg) NULL_STMT #define ASSERTMSG(expr, ...) NULL_STMT
#define FATAL(msg) NULL_STMT #define FATAL(...) NULL_STMT
#define DEBUG_MSG (void) #define DEBUG_MSG (void)
#define DEBUG_MSGV NULL_STMT #define DEBUG_MSGV NULL_STMT
#define DEBUG_BREAK_IF_DEBUGGER_PRESENT NULL_STMT #define DEBUG_BREAK_IF_DEBUGGER_PRESENT NULL_STMT

Loading…
Cancel
Save