diff options
| author | hathach <[email protected]> | 2018-04-12 17:55:15 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2018-04-12 17:55:15 +0700 |
| commit | 752a9f45d70959e36cf8c0cf3a5cd0c24731635e (patch) | |
| tree | 518c66e1efc12a0cf74ff256a96ccedecb9ef4ef /tinyusb/common | |
| parent | 6d8f4bca47d31ba4d114aa216042913031c56f1a (diff) | |
rename ASSERT_ERR to TU_ASSERT_ERR to prevent conflict with user code
Diffstat (limited to 'tinyusb/common')
| -rw-r--r-- | tinyusb/common/tusb_verify.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tinyusb/common/tusb_verify.h b/tinyusb/common/tusb_verify.h index 4a9ac2d36..13b8d39f7 100644 --- a/tinyusb/common/tusb_verify.h +++ b/tinyusb/common/tusb_verify.h @@ -164,7 +164,7 @@ static inline void verify_breakpoint(void) #define ASSERT_1ARGS(_cond) VERIFY_DEFINE(_cond, _MESS_FAILED(); verify_breakpoint(), false) #define ASSERT_2ARGS(_cond, _ret) VERIFY_DEFINE(_cond, _MESS_FAILED(); verify_breakpoint(), _ret) -#define TU_ASSERT(...) GET_3RD_ARG(__VA_ARGS__, ASSERT_2ARGS, ASSERT_1ARGS)(__VA_ARGS__) +#define TU_ASSERT(...) GET_3RD_ARG(__VA_ARGS__, ASSERT_2ARGS, ASSERT_1ARGS)(__VA_ARGS__) /*------------------------------------------------------------------*/ /* ASSERT Error @@ -173,7 +173,11 @@ static inline void verify_breakpoint(void) #define ASERT_ERR_1ARGS(_error) VERIFY_ERR_DEF2(_error, verify_breakpoint()) #define ASERT_ERR_2ARGS(_error, _ret) VERIFY_ERR_DEF3(_error, verify_breakpoint(), _ret) -#define ASSERT_ERR(...) GET_3RD_ARG(__VA_ARGS__, ASERT_ERR_2ARGS, ASERT_ERR_1ARGS)(__VA_ARGS__) +#define TU_ASSERT_ERR(...) GET_3RD_ARG(__VA_ARGS__, ASERT_ERR_2ARGS, ASERT_ERR_1ARGS)(__VA_ARGS__) + +/*------------------------------------------------------------------*/ +/* ASSERT HDLR + *------------------------------------------------------------------*/ #ifdef __cplusplus } |