diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 14:26:34 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 14:26:34 +0000 |
commit | b25c0d7701b6687e2bb3d362140d8c82984fd3ec (patch) | |
tree | 4f6a534c28887aadc27335f674722c0133c9827d | |
parent | 0bec319ab19d9db8ae390cd21c673d2f60792367 (diff) |
merge revision(s) 16641:
* numeric.c (flo_divmod): Revert the behavior change; do not
suppress an exception when div is NaN or Inf. [ruby-dev:34857]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17337 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | numeric.c | 3 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 6 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Sun Jun 15 23:26:24 2008 Akinori MUSHA <knu@iDaemons.org> + + * numeric.c (flo_divmod): Revert the behavior change; do not + suppress an exception when div is NaN or Inf. [ruby-dev:34857] + Sun Jun 15 23:21:48 2008 NAKAMURA Usaku <usa@ruby-lang.org> * file.c (BUFCHECK): wrong condition. [ruby-core:16921] @@ -760,9 +760,6 @@ flo_divmod(x, y) val = round(div); a = LONG2FIX(val); } - else if (isnan(div) || isinf(div)) { - a = rb_float_new(div); - } else { a = rb_dbl2big(div); } @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-15" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20080615 -#define RUBY_PATCHLEVEL 217 +#define RUBY_PATCHLEVEL 218 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |