aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--gc.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 341d7a5d98..45993855ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep 20 23:02:50 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * gc.c (gc_start_internal): [DOC] add ObjectSpace.garbage_collect
+ and fix GC#garbage_collect. [Bug #12777]
+
Tue Sep 20 21:24:01 2016 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* doc/extension.ja.rdoc: translate r56189 (rb_gc_adjust_memory_usage).
diff --git a/gc.c b/gc.c
index c90fc71c0d..2eb049184c 100644
--- a/gc.c
+++ b/gc.c
@@ -6576,7 +6576,8 @@ Init_stack(volatile VALUE *addr)
* GC.start -> nil
* GC.garbage_collect -> nil
* GC.start(full_mark: true, immediate_sweep: true) -> nil
- * GC.garbage_collect(full_mark: true, immediate_sweep: true) -> nil
+ * ObjectSpace.garbage_collect(full_mark: true, immediate_sweep: true) -> nil
+ * include GC; garbage_collect(full_mark: true, immediate_sweep: true) -> nil
*
* Initiates garbage collection, unless manually disabled.
*