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 /array.c | |
parent | b766cc4e70f18ab1b3be5aef35d2af8817d23714 (diff) | |
download | ruby-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 'array.c')
-rw-r--r-- | array.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -60,7 +60,7 @@ ary_memfill(VALUE ary, long beg, long size, VALUE val) { RARRAY_PTR_USE(ary, ptr, { memfill(ptr + beg, size, val); - OBJ_WRITTEN(ary, Qundef, val); + RB_OBJ_WRITTEN(ary, Qundef, val); }); } @@ -79,7 +79,7 @@ ary_memcpy(VALUE ary, long beg, long argc, const VALUE *argv) int i; RARRAY_PTR_USE(ary, ptr, { for (i=0; i<argc; i++) { - OBJ_WRITE(ary, &ptr[i+beg], argv[i]); + RB_OBJ_WRITE(ary, &ptr[i+beg], argv[i]); } }); } @@ -179,7 +179,7 @@ ary_memcpy(VALUE ary, long beg, long argc, const VALUE *argv) assert(!ARY_EMBED_P(_ary_)); \ assert(ARY_SHARED_P(_ary_)); \ assert(ARY_SHARED_ROOT_P(_value_)); \ - OBJ_WRITE(_ary_, &RARRAY(_ary_)->as.heap.aux.shared, _value_); \ + RB_OBJ_WRITE(_ary_, &RARRAY(_ary_)->as.heap.aux.shared, _value_); \ } while (0) #define RARRAY_SHARED_ROOT_FLAG FL_USER5 #define ARY_SHARED_ROOT_P(ary) (FL_TEST((ary), RARRAY_SHARED_ROOT_FLAG)) @@ -4063,7 +4063,7 @@ rb_ary_or(VALUE ary1, VALUE ary2) for (i=0; i<RARRAY_LEN(ary2); i++) { VALUE elt = RARRAY_AREF(ary2, i); if (!st_update(RHASH_TBL_RAW(hash), (st_data_t)elt, ary_hash_orset, (st_data_t)elt)) { - OBJ_WRITTEN(hash, Qundef, elt); + RB_OBJ_WRITTEN(hash, Qundef, elt); } } ary3 = rb_hash_values(hash); |