diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-27 04:10:12 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-27 04:10:12 +0000 |
| commit | 07d9c294a2c873db7b945fbaa0d2664a0eeeb76d (patch) | |
| tree | 8ca78216ae173f2a9803aa1ca2fa65e0b38f2e2b /vm_method.c | |
| parent | f70724c37d3a95bd2197f0521ec3be1eef41d9bb (diff) | |
NOEX_NOREDEF
* vm_method.c (rb_method_entry_make): use NOEX_NOREDEF itself for the
condition.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36231 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_method.c')
| -rw-r--r-- | vm_method.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/vm_method.c b/vm_method.c index 673113eaa8..6bf3c434ca 100644 --- a/vm_method.c +++ b/vm_method.c @@ -6,7 +6,10 @@ #define CACHE_MASK 0x7ff #define EXPR1(c,m) ((((c)>>3)^(m))&CACHE_MASK) +#define NOEX_NOREDEF 0 +#ifndef NOEX_NOREDEF #define NOEX_NOREDEF NOEX_RESPONDS +#endif static void rb_vm_check_redefinition_opt_method(const rb_method_entry_t *me, VALUE klass); @@ -199,9 +202,10 @@ rb_method_entry_make(VALUE klass, ID mid, rb_method_type_t type, rb_method_definition_t *old_def = old_me->def; if (rb_method_definition_eq(old_def, def)) return old_me; -#if 0 +#if NOEX_NOREDEF if (old_me->flag & NOEX_NOREDEF) { - rb_raise(rb_eTypeError, "cannot redefine %s#%s", rb_class2name(klass), rb_id2name(mid)); + rb_raise(rb_eTypeError, "cannot redefine %"PRIsVALUE"#%"PRIsVALUE, + klass, rb_id2str(mid)); } #endif rb_vm_check_redefinition_opt_method(old_me, klass); |