mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-09 18:45:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Common/Assert: no longer needs special impl for msvc

Browse Source
This commit is contained in:
Shawn Hoffman 2020-08-21 18:59:51 -07:00
parent 89b6a4cbee
commit fcc8dfd189
1 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,28 +9,6 @@
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Common/MsgHandler.h" #include "Common/MsgHandler.h"
#ifdef _WIN32
#define ASSERT_MSG(_t_, _a_, _fmt_, ...) \
do \
{ \
if (!(_a_)) \
{ \
if (!PanicYesNo(_fmt_, __VA_ARGS__)) \
Crash(); \
} \
} while (0)
#define DEBUG_ASSERT_MSG(_t_, _a_, _msg_, ...) \
do \
{ \
if (MAX_LOGLEVEL >= Common::Log::LOG_LEVELS::LDEBUG && !(_a_)) \
{ \
ERROR_LOG(_t_, _msg_, __VA_ARGS__); \
if (!PanicYesNo(_msg_, __VA_ARGS__)) \
Crash(); \
} \
} while (0)
#else
#define ASSERT_MSG(_t_, _a_, _fmt_, ...) \ #define ASSERT_MSG(_t_, _a_, _fmt_, ...) \
do \ do \
{ \ { \
@ -44,14 +22,16 @@
#define DEBUG_ASSERT_MSG(_t_, _a_, _msg_, ...) \ #define DEBUG_ASSERT_MSG(_t_, _a_, _msg_, ...) \
do \ do \
{ \ { \
if (MAX_LOGLEVEL >= Common::Log::LOG_LEVELS::LDEBUG && !(_a_)) \ if constexpr (MAX_LOGLEVEL >= Common::Log::LOG_LEVELS::LDEBUG) \
{ \ { \
ERROR_LOG(_t_, _msg_, ##__VA_ARGS__); \ if (!(_a_)) \
if (!PanicYesNo(_msg_, ##__VA_ARGS__)) \ { \
Crash(); \ ERROR_LOG(_t_, _msg_, ##__VA_ARGS__); \
if (!PanicYesNo(_msg_, ##__VA_ARGS__)) \
Crash(); \
} \
} \ } \
} while (0) } while (0)
#endif
#define ASSERT(_a_) \ #define ASSERT(_a_) \
do \ do \
@ -64,6 +44,6 @@
#define DEBUG_ASSERT(_a_) \ #define DEBUG_ASSERT(_a_) \
do \ do \
{ \ { \
if (MAX_LOGLEVEL >= Common::Log::LOG_LEVELS::LDEBUG) \ if constexpr (MAX_LOGLEVEL >= Common::Log::LOG_LEVELS::LDEBUG) \
ASSERT(_a_); \ ASSERT(_a_); \
} while (0) } while (0)