From ce9c95293757a211bf9dcdb45908a835e5080f7d Mon Sep 17 00:00:00 2001 From: shyouhei Date: Wed, 7 Jul 2010 10:59:44 +0000 Subject: [PATCH] Merge branch 'mybranch' of git://github.com/orangea/ruby into trunk Conflicts: ChangeLog git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28569 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ++++- numeric.c | 5 +---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8732f3a438..cbb3e3b47d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Jul 7 10:01:34 2010 Adrian Bloomer + + * numeric.c (fix_rev): Replaced fix_rev with '~num | FIXNUM_FLAG'. + Wed Jul 7 13:22:20 2010 NAKAMURA Usaku * file.c (ruby_find_basename): set correct baselen. @@ -24,7 +28,6 @@ Wed Jul 7 10:26:20 2010 NARUSE, Yui it causes false-negative exceptions. [ruby-dev:41778] * configure.in: ditto. - Tue Jul 6 22:57:21 2010 Tanaka Akira * io.c (nogvl_copy_stream_sendfile): jump to retry_sendfile directly diff --git a/numeric.c b/numeric.c index 81d48c1a35..8b5423b884 100644 --- a/numeric.c +++ b/numeric.c @@ -2801,10 +2801,7 @@ fix_le(VALUE x, VALUE y) static VALUE fix_rev(VALUE num) { - long val = FIX2LONG(num); - - val = ~val; - return LONG2NUM(val); + return ~num | FIXNUM_FLAG; } static VALUE