aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--vm_method.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 79204c1190..6d8f16652f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Sep 13 09:34:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm_method.c (rb_add_method_def): no warning for inherited
+ method.
+
Sun Sep 13 08:30:30 2009 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c: fix WIN32OLE_TYPELIB.new when the 1st
diff --git a/vm_method.c b/vm_method.c
index f3a0e92eeb..a2558bc6e9 100644
--- a/vm_method.c
+++ b/vm_method.c
@@ -184,7 +184,8 @@ rb_add_method_def(VALUE klass, ID mid, rb_method_type_t type, rb_method_definiti
if (RTEST(ruby_verbose) &&
old_def->alias_count == 0 &&
- old_def->type != VM_METHOD_TYPE_UNDEF) {
+ old_def->type != VM_METHOD_TYPE_UNDEF &&
+ old_def->type != VM_METHOD_TYPE_ZSUPER) {
rb_warning("method redefined; discarding old %s", rb_id2name(mid));
}
rb_free_method_entry(old_me);