summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-08 05:02:31 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-08 05:02:31 +0000
commit6baa27a6a20f3f49a853536daa4ed33594a39ce7 (patch)
tree4b6026f8e6eb5e5eec56cc29cc114385699a229d
parent78492e51d818c193eb0b2a2546c6016c07a46fcd (diff)
merge revision(s) 27087:
* ext/rational/lib/rational.rb: fix [Bug #1397]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28205 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/rational.rb2
-rw-r--r--version.h2
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f302c6a224..8e70f47376 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jun 8 14:00:33 2010 Keiju Ishitsuka <keiju@ruby-lang.org>
+
+ * ext/rational/lib/rational.rb: fix [Bug #1397].
+
Tue Jun 8 13:40:04 2010 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb (Date#>>): fixed. [ruby-core:28011]
diff --git a/lib/rational.rb b/lib/rational.rb
index 69a3b76bf1..6f61f14027 100644
--- a/lib/rational.rb
+++ b/lib/rational.rb
@@ -387,7 +387,7 @@ class Rational < Numeric
# Converts the rational to a Float.
#
def to_f
- @numerator.to_f/@denominator.to_f
+ @numerator.fdiv(@denominator)
end
#
diff --git a/version.h b/version.h
index 34b911f770..84448a4462 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2010-06-08"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20100608
-#define RUBY_PATCHLEVEL 270
+#define RUBY_PATCHLEVEL 271
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8