diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-13 00:34:11 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-13 00:34:11 +0000 |
| commit | 63b231cea0389dd9c8b9ae471b89ab0c1395d4d4 (patch) | |
| tree | 6fe27d1875503c54bd61935ebb887bf93e99d926 | |
| parent | 831396217aab4e28f441085495ffb8e10d6e9828 (diff) | |
* vm_method.c (rb_add_method_def): no warning for inherited
method.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24883 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | vm_method.c | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -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); |