matz	2010-12-22 14:38:41 +0900 (Wed, 22 Dec 2010)

  New Revision: 30291

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

  Log:
    * gc.c (Init_GC): move back object_id to Kernel. [ruby-dev:42840]

  Modified files:
    trunk/ChangeLog
    trunk/gc.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30290)
+++ ChangeLog	(revision 30291)
@@ -7,6 +7,10 @@
 
 	* NEWS: add IO#advise. [ruby-core:33110] [Ruby 1.9-Feature#4038]
 
+Tue Dec 21 23:45:31 2010  Yukihiro Matsumoto  <matz@r...>
+
+	* gc.c (Init_GC): move back object_id to Kernel. [ruby-dev:42840]
+
 Tue Dec 21 12:45:16 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (target_archs): remove temporary objects.
Index: gc.c
===================================================================
--- gc.c	(revision 30290)
+++ gc.c	(revision 30291)
@@ -3496,7 +3496,7 @@
     OBJ_FREEZE(nomem_error);
 
     rb_define_method(rb_cBasicObject, "__id__", rb_obj_id, 0);
-    rb_define_method(rb_cBasicObject, "object_id", rb_obj_id, 0);
+    rb_define_method(rb_mKernel, "object_id", rb_obj_id, 0);
 
     rb_define_module_function(rb_mObSpace, "count_objects", count_objects, -1);
 

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