ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6445 from lioncash/assert-guard 

Assert: Wrap assertion macro bodies in do {} while (0)
This commit is contained in:
Mat M 2018-03-16 12:42:56 -04:00 committed by GitHub
parent 9f4d5122a2 f44e2dc425
commit 328585ef17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
Source/Core/Common/Assert.h
View File

@ -11,41 +11,59 @@
#ifdef _WIN32 #ifdef _WIN32
#define ASSERT_MSG(_t_, _a_, _fmt_, ...) \ #define ASSERT_MSG(_t_, _a_, _fmt_, ...) \
if (!(_a_)) \ do \
{ \ { \
if (!PanicYesNo(_fmt_ "\n\nIgnore and continue?", __VA_ARGS__)) \ if (!(_a_)) \
Crash(); \ { \
} if (!PanicYesNo(_fmt_ "\n\nIgnore and continue?", __VA_ARGS__)) \
Crash(); \
} \
} while (0)
#define DEBUG_ASSERT_MSG(_t_, _a_, _msg_, ...) \ #define DEBUG_ASSERT_MSG(_t_, _a_, _msg_, ...) \
if (MAX_LOGLEVEL >= LogTypes::LOG_LEVELS::LDEBUG && !(_a_)) \ do \
{ \ { \
ERROR_LOG(_t_, _msg_, __VA_ARGS__); \ if (MAX_LOGLEVEL >= LogTypes::LOG_LEVELS::LDEBUG && !(_a_)) \
if (!PanicYesNo(_msg_, __VA_ARGS__)) \ { \
Crash(); \ ERROR_LOG(_t_, _msg_, __VA_ARGS__); \
} if (!PanicYesNo(_msg_, __VA_ARGS__)) \
Crash(); \
} \
} while (0)
#else #else
#define ASSERT_MSG(_t_, _a_, _fmt_, ...) \ #define ASSERT_MSG(_t_, _a_, _fmt_, ...) \
if (!(_a_)) \ do \
{ \ { \
if (!PanicYesNo(_fmt_, ##__VA_ARGS__)) \ if (!(_a_)) \
Crash(); \ { \
} if (!PanicYesNo(_fmt_, ##__VA_ARGS__)) \
Crash(); \
} \
} while (0)
#define DEBUG_ASSERT_MSG(_t_, _a_, _msg_, ...) \ #define DEBUG_ASSERT_MSG(_t_, _a_, _msg_, ...) \
if (MAX_LOGLEVEL >= LogTypes::LOG_LEVELS::LDEBUG && !(_a_)) \ do \
{ \ { \
ERROR_LOG(_t_, _msg_, ##__VA_ARGS__); \ if (MAX_LOGLEVEL >= LogTypes::LOG_LEVELS::LDEBUG && !(_a_)) \
if (!PanicYesNo(_msg_, ##__VA_ARGS__)) \ { \
Crash(); \ ERROR_LOG(_t_, _msg_, ##__VA_ARGS__); \
} if (!PanicYesNo(_msg_, ##__VA_ARGS__)) \
Crash(); \
} \
} while (0)
#endif #endif
#define ASSERT(_a_) \ #define ASSERT(_a_) \
ASSERT_MSG(MASTER_LOG, _a_, \ do \
_trans("An error occurred.\n\n Line: %d\n File: %s\n\nIgnore and continue?"), \ { \
__LINE__, __FILE__) ASSERT_MSG(MASTER_LOG, _a_, \
_trans("An error occurred.\n\n Line: %d\n File: %s\n\nIgnore and continue?"), \
__LINE__, __FILE__); \
} while (0)
#define DEBUG_ASSERT(_t_, _a_) \ #define DEBUG_ASSERT(_t_, _a_) \
if (MAX_LOGLEVEL >= LogTypes::LOG_LEVELS::LDEBUG) \ do \
ASSERT(_a_) { \
if (MAX_LOGLEVEL >= LogTypes::LOG_LEVELS::LDEBUG) \
ASSERT(_a_); \
} while (0)