diff options
| author | withmorten <morten.with@gmail.com> | 2021-01-21 03:40:56 +0100 |
|---|---|---|
| committer | withmorten <morten.with@gmail.com> | 2021-01-21 19:42:51 +0100 |
| commit | 034df61f3c2757b28c082101fd0f38054263c0ed (patch) | |
| tree | 24c3362300297f399149e903f29ba47b24b65303 /src/core/common.h | |
| parent | Merge remote-tracking branch 'upstream/master' into cw (diff) | |
| download | re3-034df61f3c2757b28c082101fd0f38054263c0ed.tar re3-034df61f3c2757b28c082101fd0f38054263c0ed.tar.gz re3-034df61f3c2757b28c082101fd0f38054263c0ed.tar.bz2 re3-034df61f3c2757b28c082101fd0f38054263c0ed.tar.lz re3-034df61f3c2757b28c082101fd0f38054263c0ed.tar.xz re3-034df61f3c2757b28c082101fd0f38054263c0ed.tar.zst re3-034df61f3c2757b28c082101fd0f38054263c0ed.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/core/common.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/core/common.h b/src/core/common.h index d3b0daa9..84440968 100644 --- a/src/core/common.h +++ b/src/core/common.h @@ -357,21 +357,19 @@ __inline__ void TRACE(char *f, ...) { } // this is re3 only, and so the function #endif #define ASSERT assert -#if defined DEBUG && !defined __MWERKS__ -#define re3_static_assert(bool_constexpr, message) static_assert(bool_constexpr, message) -#else -#define re3_static_assert(bool_constexpr, message) +#ifdef __MWERKS__ +#define static_assert(bool_constexpr, message) #endif #define _TODO(x) #define _TODOCONST(x) (x) #ifdef CHECK_STRUCT_SIZES -#define VALIDATE_SIZE(struc, size) re3_static_assert(sizeof(struc) == size, "Invalid structure size of " #struc) +#define VALIDATE_SIZE(struc, size) static_assert(sizeof(struc) == size, "Invalid structure size of " #struc) #else #define VALIDATE_SIZE(struc, size) #endif -#define VALIDATE_OFFSET(struc, member, offset) re3_static_assert(offsetof(struc, member) == offset, "The offset of " #member " in " #struc " is not " #offset "...") +#define VALIDATE_OFFSET(struc, member, offset) static_assert(offsetof(struc, member) == offset, "The offset of " #member " in " #struc " is not " #offset "...") #define PERCENT(x, p) ((float(x) * (float(p) / 100.0f))) #define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0])) |