actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "war on -Werror, part 9: static inline > macros."

Browse Source 
This reverts commit d080c38196.

...partly. Still have to adjust things.
This commit is contained in:
Jason Felds
2012-12-27 21:36:58 -05:00
parent 380bce948e
commit c8f8d6c459
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/global.h
+2 -14
View File
@@ -127,22 +127,10 @@ 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.) */
static inline void NORETURN _FAIL_M(const char * file, int line, const char * message) #define FAIL_M(MESSAGE) do { CHECKPOINT_M(MESSAGE); sm_crash(MESSAGE); } while(0)
{ #define ASSERT_M(COND, MESSAGE) do { if(unlikely(!(COND))) { FAIL_M(MESSAGE); } } while(0)
_CHECKPOINT_M(file, line, message);
sm_crash(message);
}
#define FAIL_M(m) (_FAIL_M(__FILE__, __LINE__, m)) #define FAIL_M(m) (_FAIL_M(__FILE__, __LINE__, m))
static inline void _ASSERT_M(const char * file, int line, bool cond, const char * message)
{
if (unlikely(!(cond)))
{
_FAIL_M(file, line, message);
}
}
#define ASSERT_M(c, m) (_ASSERT_M(__FILE__, __LINE__, c, m)) #define ASSERT_M(c, m) (_ASSERT_M(__FILE__, __LINE__, c, m))
#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