diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2021-10-25 07:59:01 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-10-25 07:59:01 +0900 |
| commit | abf2d653d7098c46b8d7c51eea381770457712f5 (patch) | |
| tree | d4fdc578a42fc922053ab141229211768c6c82b5 /src/hash.c | |
| parent | 5c6e8b32a3aaaf4ec34f6e1335e1050ffe7232b2 (diff) | |
| parent | b774832ee1a97c44cabbbaac004a3b784ed02a83 (diff) | |
| download | mruby-abf2d653d7098c46b8d7c51eea381770457712f5.tar.gz mruby-abf2d653d7098c46b8d7c51eea381770457712f5.zip | |
Merge pull request #5564 from dearblue/static_assert
Make `mrb_static_assert()` a variable argument
Diffstat (limited to 'src/hash.c')
| -rw-r--r-- | src/hash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/hash.c b/src/hash.c index a12e45bd7..c0d3d712f 100644 --- a/src/hash.c +++ b/src/hash.c @@ -69,8 +69,8 @@ #define AR_MAX_SIZE 16 #define H_MAX_SIZE EA_MAX_CAPA -mrb_static_assert1(offsetof(struct RHash, iv) == offsetof(struct RObject, iv)); -mrb_static_assert1(AR_MAX_SIZE < (1 << MRB_HASH_AR_EA_CAPA_BIT)); +mrb_static_assert(offsetof(struct RHash, iv) == offsetof(struct RObject, iv)); +mrb_static_assert(AR_MAX_SIZE < (1 << MRB_HASH_AR_EA_CAPA_BIT)); typedef struct hash_entry { mrb_value key; @@ -243,7 +243,7 @@ DEFINE_SWITCHER(ht, HT) * assumptions. */ # define HT_ASSERT_SAFE_READ(attr_name) \ - mrb_static_assert1( \ + mrb_static_assert( \ offsetof(hash_table, attr_name) + sizeof(((hash_table*)0)->attr_name) <= \ sizeof(hash_entry)) HT_ASSERT_SAFE_READ(ea); |