diff options
| author | hathach <[email protected]> | 2018-03-28 14:30:32 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2018-03-28 14:30:32 +0700 |
| commit | 0d3e66fa0a274d2482d6bbb6dea80508dcd614de (patch) | |
| tree | 7ba8cfbc6ab2d8dd220b7e4c124b4b62ff154684 /tinyusb | |
| parent | 43ac71179564fc021c2b77408b7f6ba594626007 (diff) | |
clean up static assert
Diffstat (limited to 'tinyusb')
| -rw-r--r-- | tinyusb/common/tusb_compiler.h | 10 | ||||
| -rw-r--r-- | tinyusb/common/verify.h | 15 |
2 files changed, 5 insertions, 20 deletions
diff --git a/tinyusb/common/tusb_compiler.h b/tinyusb/common/tusb_compiler.h index 62a343449..8c0e75029 100644 --- a/tinyusb/common/tusb_compiler.h +++ b/tinyusb/common/tusb_compiler.h @@ -50,18 +50,18 @@ #define XSTRING_CONCAT_(a, b) STRING_CONCAT_(a, b) ///< expand then concat
//--------------------------------------------------------------------+
-// Compile-time Assert
+// Compile-time Assert (use VERIFY_STATIC to avoid name conflict)
//--------------------------------------------------------------------+
-#ifdef __ICCARM__
+#if defined(__ICCARM__) || (__STDC_VERSION__ >= 201112L )
#define VERIFY_STATIC static_assert
#else
#if defined __COUNTER__ && __COUNTER__ != __COUNTER__
- #define _ASSERT_COUNTER __COUNTER__
+ #define _VERIFY_COUNTER __COUNTER__
#else
- #define _ASSERT_COUNTER __LINE__
+ #define _VERIFY_COUNTER __LINE__
#endif
- #define VERIFY_STATIC(const_expr, message) enum { XSTRING_CONCAT_(static_assert_, _ASSERT_COUNTER) = 1/(!!(const_expr)) }
+ #define VERIFY_STATIC(const_expr, _mess) enum { XSTRING_CONCAT_(_verify_static_, _VERIFY_COUNTER) = 1/(!!(const_expr)) }
#endif
// allow debugger to watch any module-wide variables anywhere
diff --git a/tinyusb/common/verify.h b/tinyusb/common/verify.h index 5ee80627f..a5eeb5ae8 100644 --- a/tinyusb/common/verify.h +++ b/tinyusb/common/verify.h @@ -52,21 +52,6 @@ #define GET_4TH_ARG(arg1, arg2, arg3, arg4, ...) arg4 //--------------------------------------------------------------------+ -// Compile-time Verify (like assert static) -//--------------------------------------------------------------------+ -#ifdef __ICCARM__ - #define VERIFY_STATIC static_assert -#else - #if defined __COUNTER__ && __COUNTER__ != __COUNTER__ - #define _VERIFY_COUNTER __COUNTER__ - #else - #define _VERIFY_COUNTER __LINE__ - #endif - - #define VERIFY_STATIC(const_expr, _mess) enum { XSTRING_CONCAT_(_verify_static_, _VERIFY_COUNTER) = 1/(!!(const_expr)) } -#endif - -//--------------------------------------------------------------------+ // VERIFY Helper //--------------------------------------------------------------------+ #if TUSB_CFG_DEBUG >= 1 |