From c1a0a993097575ea121b676b65ca1e311b8e4e58 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Fri, 16 Aug 2019 22:48:39 +0900 Subject: Update `struct RArray` union to silence C++ warning. --- include/mruby/array.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/mruby/array.h b/include/mruby/array.h index 0c0a002f5..a58e0dcee 100644 --- a/include/mruby/array.h +++ b/include/mruby/array.h @@ -33,6 +33,7 @@ struct RArray { } aux; mrb_value *ptr; } heap; + mrb_value ary[MRB_ARY_EMBED_LEN_MAX]; } as; }; @@ -45,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) +#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) -- cgit v1.2.3