summaryrefslogtreecommitdiff
path: root/enum.c
diff options
context:
space:
mode:
authorglass <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-05-10 02:19:55 (GMT)
committerglass <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-05-10 02:19:55 (GMT)
commit2ce35ac8636f76c09dcb1f5d56e050ca92409c14 (patch)
treed45558d4d579a22a86c209e6e1b71a0f1a70f550 /enum.c
parent615a868b4bdd063789ddefa23e6220d07afc89df (diff)
Revert "temp".
It's my fault. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50456 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enum.c')
-rw-r--r--enum.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/enum.c b/enum.c
index 69e753a..a49e4b0 100644
--- a/enum.c
+++ b/enum.c
@@ -515,18 +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) {
- ary = rb_ary_new();
- }
- else {
- ary = rb_ary_new2(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);