summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-03 00:43:39 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-03 00:43:39 +0000
commiteb3c563fa6664db186db5d8453e7d79a1a94e227 (patch)
tree4d37ea61adae25da7d013badac0a997b76f303a3
parent21ab98a997d2ed44c9c95cf5434a42561b2cd688 (diff)
* vm_args.c: fixed build error with clang
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48245 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--vm_args.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index eb11a230cc..8ef569c68d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Nov 3 09:43:30 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+
+ * vm_args.c: fixed build error with clang
+
Mon Nov 3 09:32:46 2014 NARUSE, Yui <naruse@ruby-lang.org>
* lib/uri/rfc3986_parser.rb (URI::RFC3986_Parser::RFC3986_URI):
diff --git a/vm_args.c b/vm_args.c
index c1f460a972..989fc10cc0 100644
--- a/vm_args.c
+++ b/vm_args.c
@@ -574,7 +574,7 @@ setup_parameters_complex(rb_thread_t * const th, const rb_iseq_t * const iseq, r
iseq->param.opt_num > 2 || iseq->param.flags.has_kw || iseq->param.flags.has_kwrest) && /* TODO: can be shrink with flags */
!iseq->param.flags.ambiguous_param0 &&
args_check_block_arg0(args, th, msl)) {
- given_argc = RARRAY_LEN(args->rest);
+ given_argc = RARRAY_LENINT(args->rest);
}
break;
case arg_setup_lambda:
@@ -582,7 +582,7 @@ setup_parameters_complex(rb_thread_t * const th, const rb_iseq_t * const iseq, r
given_argc != iseq->param.lead_num &&
!iseq->param.flags.has_rest &&
args_check_block_arg0(args, th, msl)) {
- given_argc = RARRAY_LEN(args->rest);
+ given_argc = RARRAY_LENINT(args->rest);
}
}