diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2020-08-07 22:56:58 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2020-10-12 16:21:30 +0900 |
| commit | 6fbc03b3a8f859eb34127d8b4c399a57f7d3d5d9 (patch) | |
| tree | 196bdb8c157ac47a84962580d697f6f8edcd5cdc /include | |
| parent | 690cafe2749e6a2b0e72785ee89fcb07bdab8b54 (diff) | |
| download | mruby-6fbc03b3a8f859eb34127d8b4c399a57f7d3d5d9.tar.gz mruby-6fbc03b3a8f859eb34127d8b4c399a57f7d3d5d9.zip | |
Revert 4c001673b
Probably I misunderstand strict aliasing rule of C++. The fix in
4c001673b was other way around.
Diffstat (limited to 'include')
| -rw-r--r-- | include/mruby/array.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/mruby/array.h b/include/mruby/array.h index 92c86a8c5..08cacaa1f 100644 --- a/include/mruby/array.h +++ b/include/mruby/array.h @@ -33,7 +33,7 @@ struct RArray { } aux; mrb_value *ptr; } heap; - void *ary[3]; + mrb_value ary[MRB_ARY_EMBED_LEN_MAX]; } as; }; @@ -46,7 +46,7 @@ struct RArray { #define ARY_UNSET_EMBED_FLAG(a) ((a)->flags &= ~(MRB_ARY_EMBED_MASK)) #define ARY_EMBED_LEN(a) ((mrb_int)(((a)->flags & MRB_ARY_EMBED_MASK) - 1)) #define ARY_SET_EMBED_LEN(a,len) ((a)->flags = ((a)->flags&~MRB_ARY_EMBED_MASK) | ((uint32_t)(len) + 1)) -#define ARY_EMBED_PTR(a) ((mrb_value*)(&(a)->as.ary)) +#define ARY_EMBED_PTR(a) ((a)->as.ary) #define ARY_LEN(a) (ARY_EMBED_P(a)?ARY_EMBED_LEN(a):(a)->as.heap.len) #define ARY_PTR(a) (ARY_EMBED_P(a)?ARY_EMBED_PTR(a):(a)->as.heap.ptr) |