shyouhei	2010-07-07 19:59:44 +0900 (Wed, 07 Jul 2010)

  New Revision: 28569

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28569

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

  Modified files:
    trunk/ChangeLog
    trunk/numeric.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28568)
+++ ChangeLog	(revision 28569)
@@ -1,3 +1,7 @@
+Wed Jul  7 10:01:34 2010  Adrian Bloomer  <adrian.bloomer@g...>
+
+	* numeric.c (fix_rev): Replaced fix_rev with '~num | FIXNUM_FLAG'.
+
 Wed Jul  7 13:22:20 2010  NAKAMURA Usaku  <usa@r...>
 
 	* file.c (ruby_find_basename): set correct baselen.
@@ -24,7 +28,6 @@
 	  it causes false-negative exceptions. [ruby-dev:41778]
 
 	* configure.in: ditto.
-
 Tue Jul  6 22:57:21 2010  Tanaka Akira  <akr@f...>
 
 	* io.c (nogvl_copy_stream_sendfile): jump to retry_sendfile directly
Index: numeric.c
===================================================================
--- numeric.c	(revision 28568)
+++ numeric.c	(revision 28569)
@@ -2801,10 +2801,7 @@
 static VALUE
 fix_rev(VALUE num)
 {
-    long val = FIX2LONG(num);
-
-    val = ~val;
-    return LONG2NUM(val);
+    return ~num | FIXNUM_FLAG;
 }
 
 static VALUE

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