summaryrefslogtreecommitdiff
path: root/vm_method.c
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-11-11 16:34:16 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-11-11 16:34:16 +0000
commit52301063d4e81d292cb180b7fe99db8e38304c61 (patch)
tree15cdbed231dcd53585eec71174a3a93006e14d85 /vm_method.c
parent8d087aa871d26f1ef22e7e9c98211d207f51360c (diff)
merge revision(s) 42902:
vm_method.c: constify * vm_method.c (rb_resolve_refined_method): constify. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43650 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_method.c')
-rw-r--r--vm_method.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/vm_method.c b/vm_method.c
index f8cd2d9129..2801107c16 100644
--- a/vm_method.c
+++ b/vm_method.c
@@ -567,7 +567,7 @@ rb_method_entry(VALUE klass, ID id, VALUE *defined_class_ptr)
static rb_method_entry_t *
get_original_method_entry(VALUE refinements,
- rb_method_entry_t *me,
+ const rb_method_entry_t *me,
VALUE *defined_class_ptr)
{
if (me->def->body.orig_me) {
@@ -583,7 +583,7 @@ get_original_method_entry(VALUE refinements,
}
rb_method_entry_t *
-rb_resolve_refined_method(VALUE refinements, rb_method_entry_t *me,
+rb_resolve_refined_method(VALUE refinements, const rb_method_entry_t *me,
VALUE *defined_class_ptr)
{
if (me && me->def->type == VM_METHOD_TYPE_REFINED) {
@@ -606,7 +606,7 @@ rb_resolve_refined_method(VALUE refinements, rb_method_entry_t *me,
}
}
else {
- return me;
+ return (rb_method_entry_t *)me;
}
}