1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vm_method.c: cast via VALUE

Browse Source 
* vm_method.c (rb_add_method, rb_attr): cast between pointer and
  ID via VALUE.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45341 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-03-15 02:19:32 +00:00
parent 47aa0056ab
commit 053ead3679
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vm_method.c
View File

@ -467,7 +467,7 @@ rb_add_method(VALUE klass, ID mid, rb_method_type_t type, void *opts, rb_method_
break; break;
case VM_METHOD_TYPE_ATTRSET: case VM_METHOD_TYPE_ATTRSET:
case VM_METHOD_TYPE_IVAR: case VM_METHOD_TYPE_IVAR:
def->body.attr.id = (ID)opts; def->body.attr.id = (ID)(VALUE)opts;
RB_OBJ_WRITE(klass, &def->body.attr.location, Qfalse); RB_OBJ_WRITE(klass, &def->body.attr.location, Qfalse);
th = GET_THREAD(); th = GET_THREAD();
cfp = rb_vm_get_ruby_level_next_cfp(th, th->cfp); cfp = rb_vm_get_ruby_level_next_cfp(th, th->cfp);
@ -868,7 +868,7 @@ extern ID rb_check_attr_id(ID id);
void void
rb_attr(VALUE klass, ID id, int read, int write, int ex) rb_attr(VALUE klass, ID id, int read, int write, int ex)
{ {
ID attriv; VALUE attriv;
VALUE aname; VALUE aname;
rb_method_flag_t noex; rb_method_flag_t noex;
@ -894,7 +894,7 @@ rb_attr(VALUE klass, ID id, int read, int write, int ex)
if (NIL_P(aname)) { if (NIL_P(aname)) {
rb_raise(rb_eArgError, "argument needs to be symbol or string"); rb_raise(rb_eArgError, "argument needs to be symbol or string");
} }
attriv = rb_intern_str(rb_sprintf("@%"PRIsVALUE, aname)); attriv = (VALUE)rb_intern_str(rb_sprintf("@%"PRIsVALUE, aname));
if (read) { if (read) {
rb_add_method(klass, id, VM_METHOD_TYPE_IVAR, (void *)attriv, noex); rb_add_method(klass, id, VM_METHOD_TYPE_IVAR, (void *)attriv, noex);
} }