nagachika	2014-05-28 00:19:53 +0900 (Wed, 28 May 2014)

  New Revision: 46185

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

  Log:
    merge revision(s) r45520: [Backport #9706]
    
    * ext/date/date_core.c (d_lite_cmp): should compare with #<.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/ext/date/date_core.c
    branches/ruby_2_1/test/date/test_switch_hitter.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 46184)
+++ ruby_2_1/ChangeLog	(revision 46185)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Wed May 28 00:18:29 2014  Tadayoshi Funaba  <tadf@d...>
+
+	* ext/date/date_core.c (d_lite_cmp): should compare with #<.
+
 Fri May 23 00:04:13 2014  Tanaka Akira  <akr@f...>
 
 	* ext/socket/socket.c (sock_s_getnameinfo): Save errno for EAI_SYSTEM.
Index: ruby_2_1/ext/date/date_core.c
===================================================================
--- ruby_2_1/ext/date/date_core.c	(revision 46184)
+++ ruby_2_1/ext/date/date_core.c	(revision 46185)
@@ -6306,7 +6306,7 @@ d_lite_cmp(VALUE self, VALUE other) https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/date/date_core.c#L6306
 		    return INT2FIX(1);
 		}
 	    }
-	    else if (a_nth < b_nth) {
+	    else if (f_lt_p(a_nth, b_nth)) {
 		return INT2FIX(-1);
 	    }
 	    else {
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 46184)
+++ ruby_2_1/version.h	(revision 46185)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
-#define RUBY_RELEASE_DATE "2014-05-23"
-#define RUBY_PATCHLEVEL 106
+#define RUBY_RELEASE_DATE "2014-05-28"
+#define RUBY_PATCHLEVEL 107
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 23
+#define RUBY_RELEASE_DAY 28
 
 #include "ruby/version.h"
 
Index: ruby_2_1/test/date/test_switch_hitter.rb
===================================================================
--- ruby_2_1/test/date/test_switch_hitter.rb	(revision 46184)
+++ ruby_2_1/test/date/test_switch_hitter.rb	(revision 46185)
@@ -312,6 +312,8 @@ class TestSH < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/date/test_switch_hitter.rb#L312
     assert_equal(-1, Date.new(2001,2,3) <=> Rational('4903888/2'))
     assert_equal(0, Date.new(2001,2,3) <=> Rational('4903887/2'))
     assert_equal(1, Date.new(2001,2,3) <=> Rational('4903886/2'))
+
+    assert_equal(-1, Date.new(-4713,11,1,Date::GREGORIAN) <=> Date.new(-4713,12,1,Date::GREGORIAN))
   end
 
   def test_eqeqeq

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r45520


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