summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gc.c11
-rw-r--r--src/print.c4
2 files changed, 7 insertions, 8 deletions
diff --git a/src/gc.c b/src/gc.c
index 8999727d0..d84f44377 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -782,7 +782,7 @@ incremental_sweep_phase(mrb_state *mrb, size_t limit)
}
}
else {
- if (!is_minor_gc(mrb))
+ if (!is_generational(mrb))
paint_partial_white(mrb, &p->as.basic); /* next gc target */
dead_slot = 0;
}
@@ -865,11 +865,10 @@ clear_all_old(mrb_state *mrb)
if (is_major_gc(mrb)) {
advance_phase(mrb, GC_STATE_NONE);
}
- else {
- mrb->is_generational_gc_mode = FALSE;
- prepare_incremental_sweep(mrb);
- advance_phase(mrb, GC_STATE_NONE);
- }
+
+ mrb->is_generational_gc_mode = FALSE;
+ prepare_incremental_sweep(mrb);
+ advance_phase(mrb, GC_STATE_NONE);
mrb->variable_gray_list = mrb->gray_list = NULL;
mrb->is_generational_gc_mode = origin_mode;
}
diff --git a/src/print.c b/src/print.c
index 3b762e05f..58297ea83 100644
--- a/src/print.c
+++ b/src/print.c
@@ -59,13 +59,13 @@ mrb_init_print(mrb_state *mrb)
void
mrb_show_version(mrb_state *mrb)
{
- printf("mruby - Embeddable Ruby Copyright (c) 2010-2012 mruby developers\n");
+ printf("mruby - Embeddable Ruby Copyright (c) 2010-2013 mruby developers\n");
}
void
mrb_show_copyright(mrb_state *mrb)
{
- printf("mruby - Copyright (c) 2010-2012 mruby developers\n");
+ printf("mruby - Copyright (c) 2010-2013 mruby developers\n");
}
#else
void