summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-26 07:07:35 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-26 07:07:35 +0000
commitb385f19c922b9186537150df3124d72d14e9c213 (patch)
tree28fb84b0ca12d7dfaab809f07234b22077cec8f4
parent9493eb7260af756626a83359e22921a786e0ba3b (diff)
* gc.c (gc_prof_set_heap_info): fix compile error when
GC_PROFILE_MORE_DETAIL != 0. the patch is provided by ko1 (Koichi Sasada). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43429 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--gc.c2
-rw-r--r--version.h6
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index dd1f34bdff..b191ef2f88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Oct 26 16:04:36 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+
+ * gc.c (gc_prof_set_heap_info): fix compile error when
+ GC_PROFILE_MORE_DETAIL != 0.
+ the patch is provided by ko1 (Koichi Sasada).
+
Thu Oct 24 23:27:12 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
* lib/rubygems: Update to RubyGems 2.0.12. [ruby-core:57818]
diff --git a/gc.c b/gc.c
index 4a2864ee70..84af4d6f58 100644
--- a/gc.c
+++ b/gc.c
@@ -4099,7 +4099,7 @@ gc_prof_set_malloc_info(rb_objspace_t *objspace)
static inline void
gc_prof_set_heap_info(rb_objspace_t *objspace, gc_profile_record *record)
{
- size_t live = objspace->heap.live_num;
+ size_t live = objspace_live_num(objspace);
size_t total = heaps_used * HEAP_OBJ_LIMIT;
record->heap_use_slots = heaps_used;
diff --git a/version.h b/version.h
index 0b9fd18864..2a61970776 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-10-24"
-#define RUBY_PATCHLEVEL 340
+#define RUBY_RELEASE_DATE "2013-10-26"
+#define RUBY_PATCHLEVEL 341
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 24
+#define RUBY_RELEASE_DAY 26
#include "ruby/version.h"