summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2014-04-24 02:37:34 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2014-04-24 02:37:34 +0900
commit0d9c872b9b366e9b2ff9b22c311a0bc6d0eb6e91 (patch)
tree30a512d7fc15a203cc2fd0299de371a9d633f0dd
parent75128295d95c80390bff0aba9e517a66b577f781 (diff)
parente248097a17a6e73d1728e4fb5916b2264ec2ed1c (diff)
downloadmruby-0d9c872b9b366e9b2ff9b22c311a0bc6d0eb6e91.tar.gz
mruby-0d9c872b9b366e9b2ff9b22c311a0bc6d0eb6e91.zip
Merge pull request #2111 from kyab/fix_msvc_warning_gc.c
Fix MSVC warning for gc.c
-rw-r--r--src/gc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gc.c b/src/gc.c
index 4db640ff4..a71bb7d37 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -373,7 +373,7 @@ gc_protect(mrb_state *mrb, struct RBasic *p)
#else
if (mrb->arena_idx >= mrb->arena_capa) {
/* 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);
}
#endif
@@ -948,7 +948,7 @@ incremental_gc_step(mrb_state *mrb)
static void
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));
if (is_major_gc(mrb)) {
@@ -1052,7 +1052,7 @@ mrb_gc_arena_restore(mrb_state *mrb, int idx)
int capa = mrb->arena_capa;
if (idx < capa / 2) {
- capa *= 0.66;
+ capa = (int)(capa * 0.66);
if (capa < MRB_GC_ARENA_SIZE) {
capa = MRB_GC_ARENA_SIZE;
}