archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 00:54:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge revision(s) 41315: [Backport #8436]

Browse source 
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]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41318 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2013-06-15 15:58:52 +00:00
parent e63d45a5f9
commit e5633967ea
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0" #define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-06-16" #define RUBY_RELEASE_DATE "2013-06-16"
#define RUBY_PATCHLEVEL 217 #define RUBY_PATCHLEVEL 218
#define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 6 #define RUBY_RELEASE_MONTH 6

2
vm_eval.c
View file

@ -1157,7 +1157,6 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char
int state; int state;
VALUE result = Qundef; VALUE result = Qundef;
VALUE envval; VALUE envval;
VALUE absolute_path = Qnil;
rb_thread_t *th = GET_THREAD(); rb_thread_t *th = GET_THREAD();
rb_env_t *env = NULL; rb_env_t *env = NULL;
rb_block_t block, *base_block; rb_block_t block, *base_block;
@ -1176,6 +1175,7 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char
rb_binding_t *bind = 0; rb_binding_t *bind = 0;
rb_iseq_t *iseq; rb_iseq_t *iseq;
volatile VALUE iseqval; volatile VALUE iseqval;
VALUE absolute_path = Qnil;
if (scope != Qnil) { if (scope != Qnil) {
if (rb_obj_is_kind_of(scope, rb_cBinding)) { if (rb_obj_is_kind_of(scope, rb_cBinding)) {