diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-07-01 08:18:18 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-07-01 08:18:18 +0000 |
| commit | e13f05f9e65e414f2fcb9d31445da1aaf7907b8a (patch) | |
| tree | 48bc2c28830952c2b25ed691b7b02da6390bc161 /vm_method.c | |
| parent | 8aee7f7e6a9bc6b9e183c9da69416b1892724460 (diff) | |
| download | ruby-e13f05f9e65e414f2fcb9d31445da1aaf7907b8a.tar.gz | |
vm_method.c: no NOEX macros
* vm_method.c (rb_method_entry_make): NOEX macros are no longer
defined.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51089 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_method.c')
| -rw-r--r-- | vm_method.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/vm_method.c b/vm_method.c index 3f12c19ac7..d1992a949b 100644 --- a/vm_method.c +++ b/vm_method.c @@ -23,11 +23,6 @@ #define GLOBAL_METHOD_CACHE(c,m) (rb_bug("global method cache disabled improperly"), NULL) #endif -#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); #define object_id idObject_id @@ -403,7 +398,7 @@ rb_method_entry_make(VALUE klass, ID mid, VALUE defined_class, rb_method_visibil { rb_method_entry_t *me; -#if NOEX_NOREDEF +#ifdef METHOD_ENTRY_NOREDEF VALUE rklass; #endif st_table *mtbl; @@ -427,7 +422,7 @@ rb_method_entry_make(VALUE klass, ID mid, VALUE defined_class, rb_method_visibil } rb_frozen_class_p(klass); -#if NOEX_NOREDEF +#ifdef METHOD_ENTRY_NOREDEF rklass = klass; #endif @@ -450,8 +445,8 @@ rb_method_entry_make(VALUE klass, ID mid, VALUE defined_class, rb_method_visibil rb_method_definition_t *old_def = old_me->def; if (rb_method_definition_eq(old_def, def)) return old_me; -#if NOEX_NOREDEF - if (old_me->flag & NOEX_NOREDEF) { +#ifdef METHOD_ENTRY_NOREDEF + if (METHOD_ENTRY_NOREDEF(old_me)) { rb_raise(rb_eTypeError, "cannot redefine %"PRIsVALUE"#%"PRIsVALUE, rb_class_name(rklass), rb_id2str(mid)); } |