From 66de1c49105ea8fcfb1e48d61cc6699bacaf6db8 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sat, 7 Jun 2008 21:08:07 +0000 Subject: merge revision(s) 15005: * eval.c (rb_define_alloc_func, rb_undef_alloc_func): should define/undef on a signleton class. [ruby-core:09959] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17012 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ eval.c | 5 +++-- version.h | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 17d674aa82..655d8a164f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jun 8 06:07:02 2008 Nobuyoshi Nakada + + * eval.c (rb_define_alloc_func, rb_undef_alloc_func): should + define/undef on a signleton class. [ruby-core:09959] + Sun Jun 8 06:03:45 2008 Nobuyoshi Nakada * time.c (time_arg): use converted object. [ruby-core:14759] diff --git a/eval.c b/eval.c index 98493b6990..14d4d8d62f 100644 --- a/eval.c +++ b/eval.c @@ -458,7 +458,8 @@ rb_define_alloc_func(klass, func) VALUE (*func) _((VALUE)); { Check_Type(klass, T_CLASS); - rb_add_method(CLASS_OF(klass), ID_ALLOCATOR, NEW_CFUNC(func, 0), NOEX_PRIVATE); + rb_add_method(rb_singleton_class(klass), ID_ALLOCATOR, NEW_CFUNC(func, 0), + NOEX_PRIVATE); } void @@ -466,7 +467,7 @@ rb_undef_alloc_func(klass) VALUE klass; { Check_Type(klass, T_CLASS); - rb_add_method(CLASS_OF(klass), ID_ALLOCATOR, 0, NOEX_UNDEF); + rb_add_method(rb_singleton_class(klass), ID_ALLOCATOR, 0, NOEX_UNDEF); } static NODE* diff --git a/version.h b/version.h index aa40be54df..c8af3f8b02 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-08" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20080608 -#define RUBY_PATCHLEVEL 164 +#define RUBY_PATCHLEVEL 165 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3