nagachika	2013-06-16 00:58:52 +0900 (Sun, 16 Jun 2013)

  New Revision: 41318

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

  Log:
    merge revision(s) 41315: [Backport #8436]
    
    vm_eval.c: suppress warning
    
    * vm_eval.c (eval_string_with_cref): move absolute_path inside
      non-exception block, since it is used only there.  [Bug #8436]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/version.h
    branches/ruby_2_0_0/vm_eval.c

Index: ruby_2_0_0/vm_eval.c
===================================================================
--- ruby_2_0_0/vm_eval.c	(revision 41317)
+++ ruby_2_0_0/vm_eval.c	(revision 41318)
@@ -1157,7 +1157,6 @@ eval_string_with_cref(VALUE self, VALUE https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/vm_eval.c#L1157
     int state;
     VALUE result = Qundef;
     VALUE envval;
-    VALUE absolute_path = Qnil;
     rb_thread_t *th = GET_THREAD();
     rb_env_t *env = NULL;
     rb_block_t block, *base_block;
@@ -1176,6 +1175,7 @@ eval_string_with_cref(VALUE self, VALUE https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/vm_eval.c#L1175
 	rb_binding_t *bind = 0;
 	rb_iseq_t *iseq;
 	volatile VALUE iseqval;
+	VALUE absolute_path = Qnil;
 
 	if (scope != Qnil) {
 	    if (rb_obj_is_kind_of(scope, rb_cBinding)) {
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 41317)
+++ ruby_2_0_0/version.h	(revision 41318)
@@ -1,6 +1,6 @@ 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-06-16"
-#define RUBY_PATCHLEVEL 217
+#define RUBY_PATCHLEVEL 218
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 6

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


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