NextCloud/dlib
1
0
Fork 0
mirror of https://github.com/davisking/dlib.git synced 2024-11-01 10:14:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Made the message argument of the DLIB_ASSERT and DLIB_CASSERT macros optional.

Browse Source
This commit is contained in:
Davis King 2016-08-28 12:07:27 -04:00
parent 3f92a5cff3
commit a670742273
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlib/assert.h
View File

@ -135,7 +135,7 @@ namespace dlib
#define DLIB_FUNCTION_NAME "unknown function" #define DLIB_FUNCTION_NAME "unknown function"
#endif #endif
#define DLIB_CASSERT(_exp,_message) \ #define DLIBM_CASSERT(_exp,_message) \
{if ( !(_exp) ) \ {if ( !(_exp) ) \
{ \ { \
dlib_assert_breakpoint(); \ dlib_assert_breakpoint(); \
@ -148,12 +148,20 @@ namespace dlib
throw dlib::fatal_error(dlib::EBROKEN_ASSERT,dlib_o_out.str()); \ throw dlib::fatal_error(dlib::EBROKEN_ASSERT,dlib_o_out.str()); \
}} }}
// Make it so the 2nd argument of DLIB_CASSERT is optional. That is, you can call it like
// DLIB_CASSERT(exp) or DLIB_CASSERT(exp,message).
#define DLIBM_CASSERT_1_ARGS(exp) DLIBM_CASSERT(exp,"")
#define DLIBM_CASSERT_2_ARGS(exp,message) DLIBM_CASSERT(exp,message)
#define DLIBM_GET_3TH_ARG(arg1, arg2, arg3, ...) arg3
#define DLIBM_CASSERT_CHOOSER(...) DLIBM_GET_3TH_ARG(__VA_ARGS__, DLIBM_CASSERT_2_ARGS, DLIBM_CASSERT_1_ARGS)
#define DLIB_CASSERT(...) DLIBM_CASSERT_CHOOSER(__VA_ARGS__)(__VA_ARGS__)
#ifdef ENABLE_ASSERTS #ifdef ENABLE_ASSERTS
#define DLIB_ASSERT(_exp,_message) DLIB_CASSERT(_exp,_message) #define DLIB_ASSERT(...) DLIB_CASSERT(__VA_ARGS__)
#define DLIB_IF_ASSERT(exp) exp #define DLIB_IF_ASSERT(exp) exp
#else #else
#define DLIB_ASSERT(_exp,_message) {} #define DLIB_ASSERT(...) {}
#define DLIB_IF_ASSERT(exp) #define DLIB_IF_ASSERT(exp)
#endif #endif