shyouhei	2008-06-15 23:26:34 +0900 (Sun, 15 Jun 2008)

  New Revision: 17337

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/numeric.c
    branches/ruby_1_8_5/version.h

  Log:
    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]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/numeric.c?r1=17337&r2=17336&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17337&r2=17336&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17337&r2=17336&diff_format=u

Index: ruby_1_8_5/numeric.c
===================================================================
--- ruby_1_8_5/numeric.c	(revision 17336)
+++ ruby_1_8_5/numeric.c	(revision 17337)
@@ -760,9 +760,6 @@
         val = round(div);
 	a = LONG2FIX(val);
     }
-    else if (isnan(div) || isinf(div)) {
-	a = rb_float_new(div);
-    }
     else {
 	a = rb_dbl2big(div);
     }
Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 17336)
+++ ruby_1_8_5/ChangeLog	(revision 17337)
@@ -1,3 +1,8 @@
+Sun Jun 15 23:26:24 2008  Akinori MUSHA  <knu@i...>
+
+	* 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@r...>
 
 	* file.c (BUFCHECK): wrong condition. [ruby-core:16921]
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 17336)
+++ ruby_1_8_5/version.h	(revision 17337)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/