summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-03-15 21:30:12 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-03-15 21:30:12 +0000
commita1f4163dd330d2cddbde0fa3407713e2338a2e7b (patch)
tree41f0ab484d2bdc4c515754f044270c19cdec9e4c
parent641e9e7bcea438c5c43b7863ae3afd380069e149 (diff)
* enumerator.c (lazy_zip_func): variadic argument needs explicit cast
on the platforms where VALUE is longer than int. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35049 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--enumerator.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 40e11d6bc1..7395dfc127 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Fri Mar 16 06:29:29 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Mar 16 06:30:10 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * enumerator.c (lazy_zip_func): variadic argument needs explicit cast
+ on the platforms where VALUE is longer than int.
* enumerator.c (lazy_init_iterator): no need to check overflow twice.
diff --git a/enumerator.c b/enumerator.c
index f79bb06577..c473260479 100644
--- a/enumerator.c
+++ b/enumerator.c
@@ -1420,7 +1420,7 @@ lazy_zip_func(VALUE val, VALUE arg, int argc, VALUE *argv)
rb_ary_push(ary, argv[1]);
for (i = 0; i < RARRAY_LEN(arg); i++) {
v = rb_rescue2(call_next, RARRAY_PTR(arg)[i], next_stopped, 0,
- rb_eStopIteration, 0);
+ rb_eStopIteration, (VALUE)0);
rb_ary_push(ary, v);
}
rb_funcall(yielder, id_yield, 1, ary);