diff options
| author | Ilya Kitaev <mbg033@gmail.com> | 2016-05-27 11:33:08 +0300 |
|---|---|---|
| committer | Ilya Kitaev <mbg033@gmail.com> | 2016-05-27 11:33:08 +0300 |
| commit | bc4584c1ff6dc54653c780864f36a867855c992e (patch) | |
| tree | f4819579e573bbd48daad96fc963d1e8583fb473 /contrib/epee/include/misc_log_ex.h | |
| parent | installing wallet_api header (diff) | |
| parent | Merge pull request #842 (diff) | |
| download | monero-bc4584c1ff6dc54653c780864f36a867855c992e.tar.xz | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'contrib/epee/include/misc_log_ex.h')
| -rw-r--r-- | contrib/epee/include/misc_log_ex.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/contrib/epee/include/misc_log_ex.h b/contrib/epee/include/misc_log_ex.h index 7cb1e61aa..82760dfff 100644 --- a/contrib/epee/include/misc_log_ex.h +++ b/contrib/epee/include/misc_log_ex.h @@ -1441,8 +1441,16 @@ POP_WARNINGS #define CHECK_AND_ASSERT_MES(expr, fail_ret_val, message) do{if(!(expr)) {LOG_ERROR(message); return fail_ret_val;};}while(0) #endif +#ifndef CHECK_AND_NO_ASSERT_MES_L +#define CHECK_AND_NO_ASSERT_MES_L(expr, fail_ret_val, l, message) do{if(!(expr)) {LOG_PRINT_L##l(message); /*LOCAL_ASSERT(expr);*/ return fail_ret_val;};}while(0) +#endif + #ifndef CHECK_AND_NO_ASSERT_MES -#define CHECK_AND_NO_ASSERT_MES(expr, fail_ret_val, message) do{if(!(expr)) {LOG_PRINT_L0(message); /*LOCAL_ASSERT(expr);*/ return fail_ret_val;};}while(0) +#define CHECK_AND_NO_ASSERT_MES(expr, fail_ret_val, message) CHECK_AND_NO_ASSERT_MES_L(expr, fail_ret_val, 0, message) +#endif + +#ifndef CHECK_AND_NO_ASSERT_MES_L1 +#define CHECK_AND_NO_ASSERT_MES_L1(expr, fail_ret_val, message) CHECK_AND_NO_ASSERT_MES_L(expr, fail_ret_val, 1, message) #endif |