summaryrefslogtreecommitdiffhomepage
path: root/src/array.c
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2012-07-29 17:42:17 -0700
committerYukihiro "Matz" Matsumoto <[email protected]>2012-07-29 17:42:17 -0700
commitff707384c37c2b12623055c00ba8b9a23aca9974 (patch)
tree0586e062177c9cdd61be6074db8c5513e436b110 /src/array.c
parentd0c1b7b4a8cad2c5a01ccfbe97ffd0381f592f39 (diff)
parent50b9f54a6527477d825049c4f0a8f14f7bb4482c (diff)
downloadmruby-ff707384c37c2b12623055c00ba8b9a23aca9974.tar.gz
mruby-ff707384c37c2b12623055c00ba8b9a23aca9974.zip
Merge pull request #407 from silverhammermba/cpp
C++ compatibility
Diffstat (limited to 'src/array.c')
-rw-r--r--src/array.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/array.c b/src/array.c
index ccd22674e..c385fe99b 100644
--- a/src/array.c
+++ b/src/array.c
@@ -46,7 +46,7 @@ ary_new_capa(mrb_state *mrb, int capa)
}
a = (struct RArray*)mrb_obj_alloc(mrb, MRB_TT_ARRAY, mrb->array_class);
- a->ptr = mrb_calloc(mrb, blen, 1);
+ a->ptr = (mrb_value *)mrb_calloc(mrb, blen, 1);
a->aux.capa = capa;
a->len = 0;
@@ -116,7 +116,7 @@ ary_modify(mrb_state *mrb, struct RArray *a)
p = a->ptr;
len = a->len * sizeof(mrb_value);
- ptr = mrb_malloc(mrb, len);
+ ptr = (mrb_value *)mrb_malloc(mrb, len);
if (p) {
memcpy(ptr, p, len);
}
@@ -132,11 +132,11 @@ static void
ary_make_shared(mrb_state *mrb, struct RArray *a)
{
if (!(a->flags & MRB_ARY_SHARED)) {
- struct mrb_shared_array *shared = mrb_malloc(mrb, sizeof(struct mrb_shared_array));
+ struct mrb_shared_array *shared = (struct mrb_shared_array *)mrb_malloc(mrb, sizeof(struct mrb_shared_array));
shared->refcnt = 1;
if (a->aux.capa > a->len) {
- a->ptr = shared->ptr = mrb_realloc(mrb, a->ptr, sizeof(mrb_value)*a->len+1);
+ a->ptr = shared->ptr = (mrb_value *)mrb_realloc(mrb, a->ptr, sizeof(mrb_value)*a->len+1);
}
else {
shared->ptr = a->ptr;
@@ -173,7 +173,7 @@ ary_expand_capa(mrb_state *mrb, struct RArray *a, int len)
if (capa > a->aux.capa) {
a->aux.capa = capa;
- a->ptr = mrb_realloc(mrb, a->ptr, sizeof(mrb_value)*capa);
+ a->ptr = (mrb_value *)mrb_realloc(mrb, a->ptr, sizeof(mrb_value)*capa);
}
}
@@ -195,7 +195,7 @@ ary_shrink_capa(mrb_state *mrb, struct RArray *a)
if (capa > a->len && capa < a->aux.capa) {
a->aux.capa = capa;
- a->ptr = mrb_realloc(mrb, a->ptr, sizeof(mrb_value)*capa);
+ a->ptr = (mrb_value *)mrb_realloc(mrb, a->ptr, sizeof(mrb_value)*capa);
}
}