summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--object.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f2ee984fa5..e43e9500d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Oct 30 10:24:35 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+
+ * object.c: Make BasicObject.new accept no parameter.
+ Revert of r26135 [ruby-core:27080], as per [ruby-core:32952].
+
Sat Oct 30 09:40:54 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* enum.c: use constants in id.h.
diff --git a/object.c b/object.c
index 252af17681..75192c1504 100644
--- a/object.c
+++ b/object.c
@@ -673,9 +673,9 @@ rb_obj_tap(VALUE obj)
* Document-method: initialize
*
* call-seq:
- * BasicObject.new( *args )
+ * BasicObject.new
*
- * Returns a new BasicObject. Arguments are ignored.
+ * Returns a new BasicObject.
*/
/*
@@ -2515,7 +2515,7 @@ Init_Object(void)
#undef rb_intern
#define rb_intern(str) rb_intern_const(str)
- rb_define_private_method(rb_cBasicObject, "initialize", rb_obj_dummy, -1);
+ rb_define_private_method(rb_cBasicObject, "initialize", rb_obj_dummy, 0);
rb_define_alloc_func(rb_cBasicObject, rb_class_allocate_instance);
rb_define_method(rb_cBasicObject, "==", rb_obj_equal, 1);
rb_define_method(rb_cBasicObject, "equal?", rb_obj_equal, 1);