summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2019-08-16 22:48:39 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2019-08-16 22:51:07 +0900
commitc1a0a993097575ea121b676b65ca1e311b8e4e58 (patch)
treedcb07ed5e5684af96deebc53f1454d2e865a7137 /include
parent0923ff6313d870cc9ae3f09c3710e2b6ffa48edc (diff)
downloadmruby-c1a0a993097575ea121b676b65ca1e311b8e4e58.tar.gz
mruby-c1a0a993097575ea121b676b65ca1e311b8e4e58.zip
Update `struct RArray` union to silence C++ warning.
Diffstat (limited to 'include')
-rw-r--r--include/mruby/array.h3
1 files changed, 2 insertions, 1 deletions
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)