diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2019-08-17 15:47:14 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2019-08-17 15:47:14 +0900 |
| commit | b55e72b2d67c1042a5170f4cc9cac809f4ed2c90 (patch) | |
| tree | 4736c9189b6687ca392fb94c4bc472dbab338b12 /include | |
| parent | 5b1f25a4e0be7d1880f237b1c1bf5845af7b8588 (diff) | |
| download | mruby-b55e72b2d67c1042a5170f4cc9cac809f4ed2c90.tar.gz mruby-b55e72b2d67c1042a5170f4cc9cac809f4ed2c90.zip | |
Resolve conflict between #4582 and C++ warning.
Diffstat (limited to 'include')
| -rw-r--r-- | include/mruby/array.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/mruby/array.h b/include/mruby/array.h index a58e0dcee..f8561d136 100644 --- a/include/mruby/array.h +++ b/include/mruby/array.h @@ -33,7 +33,9 @@ struct RArray { } aux; mrb_value *ptr; } heap; +#if defined(__cplusplus) mrb_value ary[MRB_ARY_EMBED_LEN_MAX]; +#endif } as; }; @@ -46,7 +48,11 @@ 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)) +#if defined(__cplusplus) #define ARY_EMBED_PTR(a) (a)->as.ary +#else +#define ARY_EMBED_PTR(a) ((mrb_value*)(&(a)->as)) +#endif #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) |