Commit 0d9c872b authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto

Merge pull request #2111 from kyab/fix_msvc_warning_gc.c

Fix MSVC warning for gc.c
parents 75128295 e248097a
...@@ -373,7 +373,7 @@ gc_protect(mrb_state *mrb, struct RBasic *p) ...@@ -373,7 +373,7 @@ gc_protect(mrb_state *mrb, struct RBasic *p)
#else #else
if (mrb->arena_idx >= mrb->arena_capa) { if (mrb->arena_idx >= mrb->arena_capa) {
/* extend arena */ /* extend arena */
mrb->arena_capa *= 1.5; mrb->arena_capa = (int)(mrb->arena_capa * 1.5);
mrb->arena = (struct RBasic**)mrb_realloc(mrb, mrb->arena, sizeof(struct RBasic*)*mrb->arena_capa); mrb->arena = (struct RBasic**)mrb_realloc(mrb, mrb->arena, sizeof(struct RBasic*)*mrb->arena_capa);
} }
#endif #endif
...@@ -948,7 +948,7 @@ incremental_gc_step(mrb_state *mrb) ...@@ -948,7 +948,7 @@ incremental_gc_step(mrb_state *mrb)
static void static void
clear_all_old(mrb_state *mrb) clear_all_old(mrb_state *mrb)
{ {
size_t origin_mode = mrb->is_generational_gc_mode; mrb_bool origin_mode = mrb->is_generational_gc_mode;
mrb_assert(is_generational(mrb)); mrb_assert(is_generational(mrb));
if (is_major_gc(mrb)) { if (is_major_gc(mrb)) {
...@@ -1052,7 +1052,7 @@ mrb_gc_arena_restore(mrb_state *mrb, int idx) ...@@ -1052,7 +1052,7 @@ mrb_gc_arena_restore(mrb_state *mrb, int idx)
int capa = mrb->arena_capa; int capa = mrb->arena_capa;
if (idx < capa / 2) { if (idx < capa / 2) {
capa *= 0.66; capa = (int)(capa * 0.66);
if (capa < MRB_GC_ARENA_SIZE) { if (capa < MRB_GC_ARENA_SIZE) {
capa = MRB_GC_ARENA_SIZE; capa = MRB_GC_ARENA_SIZE;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment