diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-07 15:43:37 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-07 15:43:37 +0000 |
commit | d4d045850b3a802d1f254ee48c8624f8962cae92 (patch) | |
tree | 544f7bc7239c2aeb136ea626cbff4f1a7583f10b /gc.c | |
parent | 2dbae9b1f14d43f774153a7474dba9c6134dc5b4 (diff) | |
download | ruby-d4d045850b3a802d1f254ee48c8624f8962cae92.tar.gz |
gc.c: fix argument types for st_foreach
* gc.c ({free,mark}_{method,const}_entry_i): fix argument types as
st_data_t for st_foreach().
* gc.c (rgengc_unprotect_logging_exit_func_i): add third argument.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45864 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
-rw-r--r-- | gc.c | 14 |
1 files changed, 9 insertions, 5 deletions
@@ -1454,8 +1454,9 @@ is_pointer_to_heap(rb_objspace_t *objspace, void *ptr) } static int -free_method_entry_i(ID key, rb_method_entry_t *me, st_data_t data) +free_method_entry_i(st_data_t key, st_data_t value, st_data_t data) { + rb_method_entry_t *me = (rb_method_entry_t *)value; if (!me->mark) { rb_free_method_entry(me); } @@ -1479,8 +1480,9 @@ rb_free_m_tbl_wrapper(struct method_table_wrapper *wrapper) } static int -free_const_entry_i(ID key, rb_const_entry_t *ce, st_data_t data) +free_const_entry_i(st_data_t key, st_data_t value, st_data_t data) { + rb_const_entry_t *ce = (rb_const_entry_t *)value; xfree(ce); return ST_CONTINUE; } @@ -3447,8 +3449,9 @@ rb_mark_method_entry(const rb_method_entry_t *me) } static int -mark_method_entry_i(ID key, const rb_method_entry_t *me, st_data_t data) +mark_method_entry_i(st_data_t key, st_data_t value, st_data_t data) { + const rb_method_entry_t *me = (const rb_method_entry_t *)value; struct mark_tbl_arg *arg = (void*)data; mark_method_entry(arg->objspace, me); return ST_CONTINUE; @@ -3471,8 +3474,9 @@ mark_m_tbl_wrapper(rb_objspace_t *objspace, struct method_table_wrapper *wrapper } static int -mark_const_entry_i(ID key, const rb_const_entry_t *ce, st_data_t data) +mark_const_entry_i(st_data_t key, st_data_t value, st_data_t data) { + const rb_const_entry_t *ce = (const rb_const_entry_t *)value; struct mark_tbl_arg *arg = (void*)data; gc_mark(arg->objspace, ce->value); gc_mark(arg->objspace, ce->file); @@ -4838,7 +4842,7 @@ rb_gc_writebarrier_remember_promoted(VALUE obj) static st_table *rgengc_unprotect_logging_table; static int -rgengc_unprotect_logging_exit_func_i(st_data_t key, st_data_t val) +rgengc_unprotect_logging_exit_func_i(st_data_t key, st_data_t val, st_data_t arg) { fprintf(stderr, "%s\t%d\n", (char *)key, (int)val); return ST_CONTINUE; |