From b25c0d7701b6687e2bb3d362140d8c82984fd3ec Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sun, 15 Jun 2008 14:26:34 +0000 Subject: 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 --- ChangeLog | 5 +++++ numeric.c | 3 --- version.h | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 81d60b5ec5..9700937169 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jun 15 23:26:24 2008 Akinori MUSHA + + * 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 * file.c (BUFCHECK): wrong condition. [ruby-core:16921] diff --git a/numeric.c b/numeric.c index 52775a744a..1a19d54c56 100644 --- a/numeric.c +++ b/numeric.c @@ -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); } diff --git a/version.h b/version.h index f12dd44734..bf2db9e8e6 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit v1.2.3