1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "temp"

Browse Source 
This reverts commit 3482910fc4ca8515b38f56bdd9fa0db7002413ad.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50454 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
glass 2015-05-10 02:10:16 +00:00
parent fe123a8b82
commit 7f49c1dd63
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
enum.c
View File

@ -515,6 +515,7 @@ enum_flat_map(VALUE obj)
static VALUE static VALUE
enum_to_a(int argc, VALUE *argv, VALUE obj) enum_to_a(int argc, VALUE *argv, VALUE obj)
{ {
<<<<<<< HEAD
VALUE ary, size = rb_check_funcall(obj, id_size, 0, 0); VALUE ary, size = rb_check_funcall(obj, id_size, 0, 0);
if (size == Qundef) { if (size == Qundef) {
@ -523,6 +524,9 @@ enum_to_a(int argc, VALUE *argv, VALUE obj)
else { else {
ary = rb_ary_new_capa(NUM2LONG(size)); 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); rb_block_call(obj, id_each, argc, argv, collect_all, ary);
OBJ_INFECT(ary, obj); OBJ_INFECT(ary, obj);