From 073f93d7cbd462f5227467b1a1d498281d3f3353 Mon Sep 17 00:00:00 2001 From: nagachika Date: Wed, 5 Feb 2014 14:03:31 +0000 Subject: 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44844 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ time.c | 4 ++-- version.h | 6 +++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5d3f6ff7fa..1e6144d93f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Feb 5 22:54:52 2014 Kazuki Tsujimoto + + * 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 * io.c (rb_io_syswrite): add RB_GC_GUARD diff --git a/time.c b/time.c index ac76686f46..25c7f7eba9 100644 --- a/time.c +++ b/time.c @@ -1910,7 +1910,7 @@ get_timeval(VALUE obj) 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) 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; } diff --git a/version.h b/version.h index 87920a363d..5f32612721 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #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" -- cgit v1.2.3