From 3e488e98ff8f22d187fda96f373c9f7caa5721cc Mon Sep 17 00:00:00 2001 From: shyouhei Date: Mon, 16 Nov 2009 10:42:23 +0000 Subject: * ext/bigdecimal/bigdecimal.c (BigDecimal_to_i): revert a part of r23645, which was not a bug fix. [ruby-dev:39474] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@25799 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/bigdecimal/bigdecimal.c | 12 ++++++------ version.h | 8 ++++---- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5cba4249c0..81d0281353 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Nov 16 19:28:23 2009 URABE Shyouhei + + * ext/bigdecimal/bigdecimal.c (BigDecimal_to_i): revert a part of + r23645, which was not a bug fix. [ruby-dev:39474] + Fri Sep 11 11:56:53 2009 Akinori MUSHA * class.c (rb_singleton_class_clone): Qnil must be used for a null diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c index 03fafaf0d7..21b7d8d68d 100644 --- a/ext/bigdecimal/bigdecimal.c +++ b/ext/bigdecimal/bigdecimal.c @@ -530,14 +530,14 @@ BigDecimal_to_i(VALUE self) /* Infinity or NaN not converted. */ if(VpIsNaN(p)) { - VpException(VP_EXCEPTION_NaN,"Computation results to 'NaN'(Not a Number)",1); - return Qnil; /* not reached */ + VpException(VP_EXCEPTION_NaN,"Computation results to 'NaN'(Not a Number)",0); + return Qnil; } else if(VpIsPosInf(p)) { - VpException(VP_EXCEPTION_INFINITY,"Computation results to 'Infinity'",1); - return Qnil; /* not reached */ + VpException(VP_EXCEPTION_INFINITY,"Computation results to 'Infinity'",0); + return Qnil; } else if(VpIsNegInf(p)) { - VpException(VP_EXCEPTION_INFINITY,"Computation results to '-Infinity'",1); - return Qnil; /* not reached */ + VpException(VP_EXCEPTION_INFINITY,"Computation results to '-Infinity'",0); + return Qnil; } e = VpExponent10(p); diff --git a/version.h b/version.h index 17169b15a9..19e1749e4e 100644 --- a/version.h +++ b/version.h @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2009-11-09" +#define RUBY_RELEASE_DATE "2009-11-16" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20091109 -#define RUBY_PATCHLEVEL 202 +#define RUBY_RELEASE_CODE 20091116 +#define RUBY_PATCHLEVEL 203 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 9 +#define RUBY_RELEASE_DAY 16 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit v1.2.3