1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mybranch' of git://github.com/orangea/ruby into trunk

Browse Source 
Conflicts:
	ChangeLog

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28569 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2010-07-07 10:59:44 +00:00
parent 09e1383bcf
commit ce9c952937
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,7 @@
Wed Jul 7 10:01:34 2010 Adrian Bloomer <adrian.bloomer@gmail.com>
* numeric.c (fix_rev): Replaced fix_rev with '~num | FIXNUM_FLAG'.
Wed Jul 7 13:22:20 2010 NAKAMURA Usaku <usa@ruby-lang.org> Wed Jul 7 13:22:20 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* file.c (ruby_find_basename): set correct baselen. * file.c (ruby_find_basename): set correct baselen.
@ -24,7 +28,6 @@ Wed Jul 7 10:26:20 2010 NARUSE, Yui <naruse@ruby-lang.org>
it causes false-negative exceptions. [ruby-dev:41778] it causes false-negative exceptions. [ruby-dev:41778]
* configure.in: ditto. * configure.in: ditto.
Tue Jul 6 22:57:21 2010 Tanaka Akira <akr@fsij.org> Tue Jul 6 22:57:21 2010 Tanaka Akira <akr@fsij.org>
* io.c (nogvl_copy_stream_sendfile): jump to retry_sendfile directly * io.c (nogvl_copy_stream_sendfile): jump to retry_sendfile directly

5
numeric.c
View File

@ -2801,10 +2801,7 @@ fix_le(VALUE x, VALUE y)
static VALUE static VALUE
fix_rev(VALUE num) fix_rev(VALUE num)
{ {
long val = FIX2LONG(num); return ~num | FIXNUM_FLAG;
val = ~val;
return LONG2NUM(val);
} }
static VALUE static VALUE