Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debug.h: Implement a real STATIC_ASSERT on non-GCC2.

Browse Source
This commit is contained in:
Augustin Cavalier 2018-08-22 00:32:30 -04:00
parent e0d28cdccf
commit 47b079afc9
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
headers/os/support/Debug.h
View File

@ -63,7 +63,7 @@ extern "C" {
#define ASSERT_WITH_MESSAGE(expr, msg) \ #define ASSERT_WITH_MESSAGE(expr, msg) \
(!(expr) ? _debuggerAssert( __FILE__,__LINE__, msg) \ (!(expr) ? _debuggerAssert( __FILE__,__LINE__, msg) \
: (int)0) : (int)0)
#define TRESPASS() DEBUGGER("Should not be here"); #define TRESPASS() DEBUGGER("Should not be here");
@ -72,7 +72,7 @@ extern "C" {
#else /* DEBUG == 0 */ #else /* DEBUG == 0 */
#define SET_DEBUG_ENABLED(FLAG) (void)0 #define SET_DEBUG_ENABLED(FLAG) (void)0
#define IS_DEBUG_ENABLED() (void)0 #define IS_DEBUG_ENABLED() (void)0
#define SERIAL_PRINT(ARGS) (void)0 #define SERIAL_PRINT(ARGS) (void)0
#define PRINT(ARGS) (void)0 #define PRINT(ARGS) (void)0
#define PRINT_OBJECT(OBJ) (void)0 #define PRINT_OBJECT(OBJ) (void)0
@ -90,12 +90,18 @@ extern "C" {
/* STATIC_ASSERT is a compile-time check that can be used to */ /* STATIC_ASSERT is a compile-time check that can be used to */
/* verify static expressions such as: STATIC_ASSERT(sizeof(int64) == 8); */ /* verify static expressions such as: STATIC_ASSERT(sizeof(int64) == 8); */
#define STATIC_ASSERT(x) \ #if __GNUC__ >= 5 && !defined(__cplusplus)
do { \ # define STATIC_ASSERT(x) _Static_assert(x, "static assert failed!")
struct __staticAssertStruct__ { \ #elif defined(__cplusplus) && __cplusplus >= 201103L
char __static_assert_failed__[2*(x) - 1]; \ # define STATIC_ASSERT(x) static_assert(x, "static assert failed!")
}; \ #else
} while (false) # define STATIC_ASSERT(x) \
do { \
struct __staticAssertStruct__ { \
char __static_assert_failed__[2*(x) - 1]; \
}; \
} while (false)
#endif
#endif /* _DEBUG_H */ #endif /* _DEBUG_H */

18
headers/private/kernel/debug.h
View File

@ -69,12 +69,18 @@
# define ASSERT_PRINT(x, format, args...) do { } while(0) # define ASSERT_PRINT(x, format, args...) do { } while(0)
#endif #endif
#define STATIC_ASSERT(x) \ #if __GNUC__ >= 5 && !defined(__cplusplus)
do { \ # define STATIC_ASSERT(x) _Static_assert(x, "static assert failed!")
struct __staticAssertStruct__ { \ #elif defined(__cplusplus) && __cplusplus >= 201103L
char __static_assert_failed__[2*(x) - 1]; \ # define STATIC_ASSERT(x) static_assert(x, "static assert failed!")
}; \ #else
} while (false) # define STATIC_ASSERT(x) \
do { \
struct __staticAssertStruct__ { \
char __static_assert_failed__[2*(x) - 1]; \
}; \
} while (false)
#endif
#if KDEBUG #if KDEBUG
# define KDEBUG_ONLY(x) x # define KDEBUG_ONLY(x) x