aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-08 14:41:17 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-08 14:41:17 +0000
commitdd00d45244fd58fc1f5bf9c110bf48fb4ccf37b8 (patch)
tree3d6571b5052f6d5546ca5629a16109de4212c4b8
parented5d5c5829ccd91261b27438e2aa146f7aec755e (diff)
downloadruby-dd00d45244fd58fc1f5bf9c110bf48fb4ccf37b8.tar.gz
* numeric.c (flo_eq): supress a warning on VC++ for x64.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26050 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--numeric.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index feecb713d7..92b43675f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec 8 23:39:52 2009 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * numeric.c (flo_eq): supress a warning on VC++ for x64.
+
Tue Dec 8 16:19:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/rubygems: update to 1.3.5.
diff --git a/numeric.c b/numeric.c
index 8d0c7534b5..11d67fef5d 100644
--- a/numeric.c
+++ b/numeric.c
@@ -904,7 +904,7 @@ flo_eq(VALUE x, VALUE y)
switch (TYPE(y)) {
case T_FIXNUM:
- b = FIX2LONG(y);
+ b = (double)FIX2LONG(y);
break;
case T_BIGNUM:
b = rb_big2dbl(y);