diff options
author | glass <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-10 02:10:16 +0000 |
---|---|---|
committer | glass <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-10 02:10:16 +0000 |
commit | 7f49c1dd63c39ee830563f09c9a2807b7c38d6d3 (patch) | |
tree | 9731d680f44b56b2a5a3f921891194d9e0f67b61 | |
parent | fe123a8b825612ae557f21749e05a31607a0f46a (diff) | |
download | ruby-7f49c1dd63c39ee830563f09c9a2807b7c38d6d3.tar.gz |
Revert "temp"
This reverts commit 3482910fc4ca8515b38f56bdd9fa0db7002413ad.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50454 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | enum.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -515,6 +515,7 @@ enum_flat_map(VALUE obj) static VALUE enum_to_a(int argc, VALUE *argv, VALUE obj) { +<<<<<<< HEAD VALUE ary, size = rb_check_funcall(obj, id_size, 0, 0); if (size == Qundef) { @@ -523,6 +524,9 @@ enum_to_a(int argc, VALUE *argv, VALUE obj) else { ary = rb_ary_new_capa(NUM2LONG(size)); } +======= + VALUE ary = rb_ary_new(); +>>>>>>> parent of 3482910... temp rb_block_call(obj, id_each, argc, argv, collect_all, ary); OBJ_INFECT(ary, obj); |