Skip to content

Commit e563396

Browse files
committed
merge revision(s) 41315: [Backport ruby#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 ruby#8436] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41318 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent e63d45a commit e563396

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#define RUBY_VERSION "2.0.0"
22
#define RUBY_RELEASE_DATE "2013-06-16"
3-
#define RUBY_PATCHLEVEL 217
3+
#define RUBY_PATCHLEVEL 218
44

55
#define RUBY_RELEASE_YEAR 2013
66
#define RUBY_RELEASE_MONTH 6

vm_eval.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1157,7 +1157,6 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char
11571157
int state;
11581158
VALUE result = Qundef;
11591159
VALUE envval;
1160-
VALUE absolute_path = Qnil;
11611160
rb_thread_t *th = GET_THREAD();
11621161
rb_env_t *env = NULL;
11631162
rb_block_t block, *base_block;
@@ -1176,6 +1175,7 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char
11761175
rb_binding_t *bind = 0;
11771176
rb_iseq_t *iseq;
11781177
volatile VALUE iseqval;
1178+
VALUE absolute_path = Qnil;
11791179

11801180
if (scope != Qnil) {
11811181
if (rb_obj_is_kind_of(scope, rb_cBinding)) {

0 commit comments

Comments
 (0)