diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-20 08:07:47 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-20 08:07:47 +0000 |
| commit | c702005a7bbb807cab666537b5ef1877c14c40ba (patch) | |
| tree | fe291003d37a71b882b91bceaad7ff3d432cd6d7 /vm_method.c | |
| parent | b766cc4e70f18ab1b3be5aef35d2af8817d23714 (diff) | |
| download | bundler-c702005a7bbb807cab666537b5ef1877c14c40ba.tar.gz | |
* include/ruby/ruby.h: rename OBJ_WRITE and OBJ_WRITTEN into
RB_OBJ_WRITE and RB_OBJ_WRITTEN.
* array.c, class.c, compile.c, hash.c, internal.h, iseq.c,
proc.c, process.c, re.c, string.c, variable.c, vm.c,
vm_eval.c, vm_insnhelper.c, vm_insnhelper.h,
vm_method.c: catch up this change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44299 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_method.c')
| -rw-r--r-- | vm_method.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vm_method.c b/vm_method.c index e910e5b941..737cd26956 100644 --- a/vm_method.c +++ b/vm_method.c @@ -322,7 +322,7 @@ rb_method_entry_make(VALUE klass, ID mid, rb_method_type_t type, me->flag = NOEX_WITH_SAFE(noex); me->mark = 0; me->called_id = mid; - OBJ_WRITE(klass, &me->klass, defined_class); + RB_OBJ_WRITE(klass, &me->klass, defined_class); me->def = def; if (def) { @@ -330,13 +330,13 @@ rb_method_entry_make(VALUE klass, ID mid, rb_method_type_t type, switch(def->type) { case VM_METHOD_TYPE_ISEQ: - OBJ_WRITTEN(klass, Qundef, def->body.iseq->self); + RB_OBJ_WRITTEN(klass, Qundef, def->body.iseq->self); break; case VM_METHOD_TYPE_IVAR: - OBJ_WRITTEN(klass, Qundef, def->body.attr.location); + RB_OBJ_WRITTEN(klass, Qundef, def->body.attr.location); break; case VM_METHOD_TYPE_BMETHOD: - OBJ_WRITTEN(klass, Qundef, def->body.proc); + RB_OBJ_WRITTEN(klass, Qundef, def->body.proc); break; default:; /* ignore */ @@ -438,7 +438,7 @@ rb_add_method(VALUE klass, ID mid, rb_method_type_t type, void *opts, rb_method_ case VM_METHOD_TYPE_ISEQ: { rb_iseq_t *iseq = (rb_iseq_t *)opts; *(rb_iseq_t **)&def->body.iseq = iseq; - OBJ_WRITTEN(klass, Qundef, iseq->self); + RB_OBJ_WRITTEN(klass, Qundef, iseq->self); break; } case VM_METHOD_TYPE_CFUNC: @@ -450,16 +450,16 @@ rb_add_method(VALUE klass, ID mid, rb_method_type_t type, void *opts, rb_method_ case VM_METHOD_TYPE_ATTRSET: case VM_METHOD_TYPE_IVAR: def->body.attr.id = (ID)opts; - OBJ_WRITE(klass, &def->body.attr.location, Qfalse); + RB_OBJ_WRITE(klass, &def->body.attr.location, Qfalse); th = GET_THREAD(); cfp = rb_vm_get_ruby_level_next_cfp(th, th->cfp); if (cfp && (line = rb_vm_get_sourceline(cfp))) { VALUE location = rb_ary_new3(2, cfp->iseq->location.path, INT2FIX(line)); - OBJ_WRITE(klass, &def->body.attr.location, rb_ary_freeze(location)); + RB_OBJ_WRITE(klass, &def->body.attr.location, rb_ary_freeze(location)); } break; case VM_METHOD_TYPE_BMETHOD: - OBJ_WRITE(klass, &def->body.proc, (VALUE)opts); + RB_OBJ_WRITE(klass, &def->body.proc, (VALUE)opts); break; case VM_METHOD_TYPE_NOTIMPLEMENTED: setup_method_cfunc_struct(&def->body.cfunc, rb_f_notimplement, -1); |