war on -Werror, part 9: static inline > macros.
At least, according to the new wisdom of today.
This commit is contained in:
+14
-2
@@ -125,8 +125,20 @@ void NORETURN sm_crash( const char *reason = "Internal error" );
|
|||||||
* This should probably be used instead of throwing an exception in most
|
* This should probably be used instead of throwing an exception in most
|
||||||
* cases we expect never to happen (but not in cases that we do expect,
|
* cases we expect never to happen (but not in cases that we do expect,
|
||||||
* such as DSound init failure.) */
|
* such as DSound init failure.) */
|
||||||
#define FAIL_M(MESSAGE) do { CHECKPOINT_M(MESSAGE); sm_crash(MESSAGE); } while(0)
|
static inline void FAIL_M(const char * MESSAGE)
|
||||||
#define ASSERT_M(COND, MESSAGE) do { if(unlikely(!(COND))) { FAIL_M(MESSAGE); } } while(0)
|
{
|
||||||
|
CHECKPOINT_M(MESSAGE);
|
||||||
|
sm_crash(MESSAGE);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void ASSERT_M(bool COND, const char * MESSAGE)
|
||||||
|
{
|
||||||
|
if (unlikely(!(COND)))
|
||||||
|
{
|
||||||
|
FAIL_M(MESSAGE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#if !defined(CO_EXIST_WITH_MFC)
|
#if !defined(CO_EXIST_WITH_MFC)
|
||||||
#define ASSERT(COND) ASSERT_M((COND), "Assertion '" #COND "' failed")
|
#define ASSERT(COND) ASSERT_M((COND), "Assertion '" #COND "' failed")
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user