aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-09-27 08:20:19 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-09-27 08:20:19 +0000
commit78a49728b2198db692cae1418601bf1b8c61cb08 (patch)
treefb6b7570399b1119303da79318a538773858835f
parent3c5529f66d13564e78c7bdbcd23e92ea3774005a (diff)
downloadruby-78a49728b2198db692cae1418601bf1b8c61cb08.tar.gz
* gc.c (gc_before_sweep): cast to size_t to suppress warnings.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43070 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--gc.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 41c519b2a3..2000100d92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Sep 27 17:19:39 2013 Koichi Sasada <ko1@atdot.net>
+
+ * gc.c (gc_before_sweep): cast to size_t to suppress warnings.
+
Fri Sep 27 17:07:55 2013 Koichi Sasada <ko1@atdot.net>
* gc.c: add some fine-grained profiling codes to tuning marking phase.
diff --git a/gc.c b/gc.c
index 99d2939dd1..75316a03c1 100644
--- a/gc.c
+++ b/gc.c
@@ -2405,13 +2405,13 @@ gc_before_sweep(rb_objspace_t *objspace)
size_t old_limit = malloc_limit;
if (inc > malloc_limit) {
- malloc_limit += malloc_limit * (initial_params.initial_malloc_limit_factor - 1); /* 1 > factor */
+ malloc_limit += (size_t)(malloc_limit * (initial_params.initial_malloc_limit_factor - 1));
if (malloc_limit > initial_malloc_limit_max) {
malloc_limit = initial_malloc_limit_max;
}
}
else {
- malloc_limit -= malloc_limit * ((initial_params.initial_malloc_limit_factor - 1) / 4);
+ malloc_limit -= (size_t)(malloc_limit * ((initial_params.initial_malloc_limit_factor - 1) / 4));
if (malloc_limit < initial_malloc_limit) {
malloc_limit = initial_malloc_limit;
}