summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-13 23:12:45 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-13 23:12:45 +0000
commit30a69a5998b651508d3d6e4177dbec19ae44663b (patch)
treef317140200335d53b328e7870aec4e6d71e61b14
parent6c0a375c58e99d1f5f1c9b9754d1bb87f1646f61 (diff)
* gc.c: fix build error caused by implicit conversion with clang.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48416 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--gc.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ae0dab9be3..36cfa73cc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Nov 14 08:12:40 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+
+ * gc.c: fix build error caused by implicit conversion with clang.
+
Fri Nov 14 06:54:06 2014 Eric Wong <e@80x24.org>
* insns.def (opt_succ): remove Time#succ optimization
diff --git a/gc.c b/gc.c
index 4d8700817e..b4077519fc 100644
--- a/gc.c
+++ b/gc.c
@@ -5124,7 +5124,7 @@ gc_marks_continue(rb_objspace_t *objspace, rb_heap_t *heap)
if (slots > 0) {
gc_report(2, objspace, "gc_marks_continue: provide %d slots from %s.\n", slots, from);
- gc_marks_step(objspace, objspace->rincgc.step_slots);
+ gc_marks_step(objspace, (int)objspace->rincgc.step_slots);
}
else {
gc_report(2, objspace, "gc_marks_continue: no more pooled pages (stack depth: %d).\n", (int)mark_stack_size(&objspace->mark_stack));