nagachika	2013-11-12 01:34:16 +0900 (Tue, 12 Nov 2013)

  New Revision: 43650

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=43650

  Log:
    merge revision(s) 42902:
    
    vm_method.c: constify
    
    * vm_method.c (rb_resolve_refined_method): constify.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/method.h
    branches/ruby_2_0_0/version.h
    branches/ruby_2_0_0/vm_method.c
Index: ruby_2_0_0/method.h
===================================================================
--- ruby_2_0_0/method.h	(revision 43649)
+++ ruby_2_0_0/method.h	(revision 43650)
@@ -112,7 +112,7 @@ rb_method_entry_t *rb_add_method(VALUE k https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/method.h#L112
 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);
Index: ruby_2_0_0/vm_method.c
===================================================================
--- ruby_2_0_0/vm_method.c	(revision 43649)
+++ ruby_2_0_0/vm_method.c	(revision 43650)
@@ -567,7 +567,7 @@ rb_method_entry(VALUE klass, ID id, VALU https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/vm_method.c#L567
 
 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 refineme https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/vm_method.c#L583
 }
 
 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 refineme https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/vm_method.c#L606
 	}
     }
     else {
-	return me;
+	return (rb_method_entry_t *)me;
     }
 }
 
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 43649)
+++ ruby_2_0_0/version.h	(revision 43650)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #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"
 

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r42902


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/