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

3 files changed, 7 insertions, 7 deletions

diff --git a/method.h b/method.h
index b99674a913..f2f519679e 100644
--- a/method.h
+++ b/method.h
@@ -112,7 +112,7 @@ rb_method_entry_t *rb_add_method(VALUE klass, ID mid, rb_method_type_t type, voi
 rb_method_entry_t *rb_method_entry(VALUE klass, ID id, VALUE *define_class_ptr);
 void rb_add_refined_method_entry(VALUE refined_class, ID mid);
 rb_method_entry_t *rb_resolve_refined_method(VALUE refinements,
-					     rb_method_entry_t *me,
+					     const rb_method_entry_t *me,
 					     VALUE *defined_class_ptr);
 rb_method_entry_t *rb_method_entry_with_refinements(VALUE klass, ID id,
 						    VALUE *defined_class_ptr);
diff --git a/version.h b/version.h
index cfc84cdf5b..9c9b520617 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-11-11"
-#define RUBY_PATCHLEVEL 345
+#define RUBY_RELEASE_DATE "2013-11-12"
+#define RUBY_PATCHLEVEL 346
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 11
+#define RUBY_RELEASE_DAY 12
 
 #include "ruby/version.h"
 
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;
     }
 }