From 970399a9ae739cbb4babc94159abe3b523d53d0f Mon Sep 17 00:00:00 2001 From: ko1 Date: Thu, 3 Sep 2015 19:48:12 +0000 Subject: * iseq.c (iseq_memsize): functions for wrapper object should have iseqw_ prefix. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51755 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ iseq.c | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9daf5aa052..7b2046fbd9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Sep 4 04:46:54 2015 Koichi Sasada + + * iseq.c (iseq_memsize): functions for wrapper object should have + iseqw_ prefix. + Thu Sep 3 21:12:12 2015 Nobuyoshi Nakada * lib/cgi/session.rb (create_new_id): use SHA512 instead of MD5. diff --git a/iseq.c b/iseq.c index fa89f512d8..c10e64167c 100644 --- a/iseq.c +++ b/iseq.c @@ -143,9 +143,8 @@ param_keyword_size(const struct rb_iseq_param_keyword *pkw) } static size_t -iseq_memsize(const void *ptr) +iseq_memsize(const rb_iseq_t *iseq) { - const rb_iseq_t *iseq = ptr; size_t size = 0; /* struct already counted as RVALUE size */ const struct rb_iseq_variable_body *variable_body; const struct rb_iseq_constant_body *body; @@ -681,9 +680,15 @@ iseqw_mark(void *ptr) rb_gc_mark((VALUE)ptr); } +static size_t +iseqw_memsize(const void *ptr) +{ + return iseq_memsize((const rb_iseq_t *)ptr); +} + static const rb_data_type_t iseqw_data_type = { "T_IMEMO/iseq", - {iseqw_mark, NULL, iseq_memsize,}, + {iseqw_mark, NULL, iseqw_memsize,}, 0, 0, RUBY_TYPED_FREE_IMMEDIATELY|RUBY_TYPED_WB_PROTECTED }; -- cgit v1.2.3