From 272dd5c6b7c5cfe05a8b360b9e9d76a90f9e647f Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 20 Dec 2012 10:03:54 +0000 Subject: merge revision(s) 38364,38366: [Backport #7557] * object.c (Init_Object): use rb_mod_init_copy for Class#initialize_copy * class.c (rb_class_init_copy): rename to class_init_copy_check, performs type checks on arguments to prevent reinitialization of initialized class [ruby-core:50869] [Bug #7557] * class.c (rb_mod_init_copy): use class_init_copy_check if receiver is T_CLASS * test/ruby/test_class.rb (class TestClass): related test git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38507 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- object.c | 1 - 1 file changed, 1 deletion(-) (limited to 'object.c') diff --git a/object.c b/object.c index f45e013a13..2c0aa7d8e2 100644 --- a/object.c +++ b/object.c @@ -2791,7 +2791,6 @@ Init_Object(void) rb_define_method(rb_cClass, "allocate", rb_obj_alloc, 0); rb_define_method(rb_cClass, "new", rb_class_new_instance, -1); rb_define_method(rb_cClass, "initialize", rb_class_initialize, -1); - rb_define_method(rb_cClass, "initialize_copy", rb_class_init_copy, 1); /* in class.c */ rb_define_method(rb_cClass, "superclass", rb_class_superclass, 0); rb_define_alloc_func(rb_cClass, rb_class_s_alloc); rb_undef_method(rb_cClass, "extend_object"); -- cgit v1.2.3