summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-09-05 21:45:25 +0000
committermarcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-09-05 21:45:25 +0000
commit80f54e68108a11447168d299f46abce461565f27 (patch)
tree357955550bcfaacf8a4ea652e37eb4acaf20257d
parent3dc28710c98502db74dc103bcdc58b65564e83ab (diff)
* numeric.c (dbl2ival): Fix Float#divmod and #round for 32 bit platform
part 1 of [bug #5276] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--numeric.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5072a04196..3570298a26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep 6 06:44:57 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+
+ * numeric.c (dbl2ival): Fix Float#divmod and #round for 32 bit
+ platform. part 1 of [bug #5276]
+
Tue Sep 6 06:44:25 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* numeric.c (flo_round): Fix criteria for 32 bits platform
diff --git a/numeric.c b/numeric.c
index 87afe14662..18f5e1cd1a 100644
--- a/numeric.c
+++ b/numeric.c
@@ -873,8 +873,8 @@ flo_mod(VALUE x, VALUE y)
static VALUE
dbl2ival(double d)
{
+ d = round(d);
if (FIXABLE(d)) {
- d = round(d);
return LONG2FIX((long)d);
}
return rb_dbl2big(d);