diff options
-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); |