From f79e9281ff757e8c8c8ccc566c76ea3b2a86de7d Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 11 Apr 2008 08:06:31 +0000 Subject: [PATCH] * enum.c (find_index_i): modified to shut warning up. * enum.c (find_index_iter_i): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15973 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ enum.c | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 55a2a97726..ec085e4891 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Apr 11 17:06:01 2008 Yukihiro Matsumoto + + * enum.c (find_index_i): modified to shut warning up. + + * enum.c (find_index_iter_i): ditto. + Fri Apr 11 16:44:43 2008 Akinori MUSHA * enum.c (enum_find_index): Add support for find_index(obj); diff --git a/enum.c b/enum.c index d4de80d7b5..cbde2b4e87 100644 --- a/enum.c +++ b/enum.c @@ -186,8 +186,10 @@ enum_find(int argc, VALUE *argv, VALUE obj) } static VALUE -find_index_i(VALUE i, VALUE *memo) +find_index_i(VALUE i, VALUE memop, int argc, VALUE *argv) { + VALUE *memo = (VALUE*)memop; + if (rb_equal(i, memo[2])) { memo[0] = UINT2NUM(memo[1]); rb_iter_break(); @@ -197,8 +199,9 @@ find_index_i(VALUE i, VALUE *memo) } static VALUE -find_index_iter_i(VALUE i, VALUE *memo, int argc, VALUE *argv) +find_index_iter_i(VALUE i, VALUE memop, int argc, VALUE *argv) { + VALUE *memo = (VALUE*)memop; if (RTEST(enum_yield(argc, argv))) { memo[0] = UINT2NUM(memo[1]); rb_iter_break();