summaryrefslogtreecommitdiff
path: root/enumerator.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-18 08:05:32 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-18 08:05:32 +0000
commite07cb859cc882adc05f818466b45e75f1d5a1e39 (patch)
treebdb9cf7c15bd7db7fdaa0ddf4ee53e03e58f5780 /enumerator.c
parent0f6d9dfc96c145e69b94d24d51d98480abd72ae1 (diff)
* suppressed shorten-64-to-32 warnings.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24195 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enumerator.c')
-rw-r--r--enumerator.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/enumerator.c b/enumerator.c
index 355a8f3948..ebb753125e 100644
--- a/enumerator.c
+++ b/enumerator.c
@@ -389,7 +389,7 @@ enumerator_each(VALUE obj)
if (!rb_block_given_p()) return obj;
e = enumerator_ptr(obj);
if (e->args) {
- argc = RARRAY_LEN(e->args);
+ argc = RARRAY_LENINT(e->args);
argv = RARRAY_PTR(e->args);
}
return rb_block_call(e->obj, e->meth, argc, argv,
@@ -430,7 +430,7 @@ enumerator_with_index(int argc, VALUE *argv, VALUE obj)
memo = NIL_P(memo) ? 0 : (VALUE)NUM2LONG(memo);
e = enumerator_ptr(obj);
if (e->args) {
- argc = RARRAY_LEN(e->args);
+ argc = RARRAY_LENINT(e->args);
argv = RARRAY_PTR(e->args);
}
else {
@@ -486,7 +486,7 @@ enumerator_with_object(VALUE obj, VALUE memo)
RETURN_ENUMERATOR(obj, 1, &memo);
e = enumerator_ptr(obj);
if (e->args) {
- argc = RARRAY_LEN(e->args);
+ argc = RARRAY_LENINT(e->args);
argv = RARRAY_PTR(e->args);
}
rb_block_call(e->obj, e->meth, argc, argv,
@@ -616,8 +616,8 @@ inspect_enumerator(VALUE obj, VALUE dummy, int recur)
rb_str_concat(str, rb_inspect(arg));
rb_str_buf_cat2(str, argc > 0 ? ", " : ")");
- if (OBJ_TAINTED(arg)) tainted = Qtrue;
- if (OBJ_UNTRUSTED(arg)) untrusted = Qtrue;
+ if (OBJ_TAINTED(arg)) tainted = TRUE;
+ if (OBJ_UNTRUSTED(arg)) untrusted = TRUE;
}
}