nagachika	2014-02-05 23:03:31 +0900 (Wed, 05 Feb 2014)

  New Revision: 44844

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

  Log:
    merge revision(s) r42456: [Backport #8101]
    
    * time.c (get_timeval, get_new_timeval): use rb_obj_class()
      instead of CLASS_OF() because CLASS_OF() may return
      a singleton class.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/time.c
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/time.c
===================================================================
--- ruby_2_0_0/time.c	(revision 44843)
+++ ruby_2_0_0/time.c	(revision 44844)
@@ -1910,7 +1910,7 @@ get_timeval(VALUE obj) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/time.c#L1910
     struct time_object *tobj;
     TypedData_Get_Struct(obj, struct time_object, &time_data_type, tobj);
     if (!TIME_INIT_P(tobj)) {
-	rb_raise(rb_eTypeError, "uninitialized %"PRIsVALUE, CLASS_OF(obj));
+	rb_raise(rb_eTypeError, "uninitialized %"PRIsVALUE, rb_obj_class(obj));
     }
     return tobj;
 }
@@ -1921,7 +1921,7 @@ get_new_timeval(VALUE obj) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/time.c#L1921
     struct time_object *tobj;
     TypedData_Get_Struct(obj, struct time_object, &time_data_type, tobj);
     if (TIME_INIT_P(tobj)) {
-	rb_raise(rb_eTypeError, "already initialized %"PRIsVALUE, CLASS_OF(obj));
+	rb_raise(rb_eTypeError, "already initialized %"PRIsVALUE, rb_obj_class(obj));
     }
     return tobj;
 }
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 44843)
+++ ruby_2_0_0/ChangeLog	(revision 44844)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Wed Feb  5 22:54:52 2014  Kazuki Tsujimoto  <kazuki@c...>
+
+	* time.c (get_timeval, get_new_timeval): use rb_obj_class()
+	  instead of CLASS_OF() because CLASS_OF() may return
+	  a singleton class.
+
 Sun Feb 2 05:48:42 2014  Eric Wong <e@8...>
 
 	* io.c (rb_io_syswrite): add RB_GC_GUARD
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 44843)
+++ ruby_2_0_0/version.h	(revision 44844)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2014-02-02"
-#define RUBY_PATCHLEVEL 394
+#define RUBY_RELEASE_DATE "2014-02-05"
+#define RUBY_PATCHLEVEL 395
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 2
+#define RUBY_RELEASE_DAY 5
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r42456


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