summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-01-07 15:47:45 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-01-07 15:47:45 +0000
commite3b07320500d117df3b56250bcf51bd30eeaa3cb (patch)
tree46b2df65c828bb0e29738affd032435accac0deb
parent8d4baab08fd1ae6499406c527db5d5fd6a014e02 (diff)
* gc.c: get rid of implicit narrowing conversion.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34230 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--gc.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b4651e3230..d34740c3e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jan 8 00:46:34 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * gc.c: get rid of implicit narrowing conversion.
+
Sun Jan 8 00:10:10 2012 NARUSE, Yui <naruse@ruby-lang.org>
* configure.in: check posix_memalign(3) and menalign(3).
diff --git a/gc.c b/gc.c
index d99b9c496f..d967fd8576 100644
--- a/gc.c
+++ b/gc.c
@@ -537,7 +537,7 @@ rb_objspace_free(rb_objspace_t *objspace)
#define HEAP_ALIGN_MASK 0x3fff
#define HEAP_SIZE HEAP_ALIGN
-#define HEAP_OBJ_LIMIT (HEAP_SIZE/(unsigned int)sizeof(struct RVALUE) - (sizeof(struct heaps_slot)/(unsigned int)sizeof(struct RVALUE)+1))
+#define HEAP_OBJ_LIMIT (HEAP_SIZE/(unsigned int)sizeof(struct RVALUE) - (unsigned int)(sizeof(struct heaps_slot)/sizeof(struct RVALUE)+1))
#define HEAP_BITMAP_LIMIT (HEAP_OBJ_LIMIT/sizeof(uintptr_t)+1)
#define GET_HEAP_SLOT(x) (HEAP_SLOT(((uintptr_t)x) & ~(HEAP_ALIGN_MASK)))