From 8d5f3471b0eaba08bbb61c801fdecdc1b3115727 Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 21 May 2009 14:47:27 +0000 Subject: merges r23371 from trunk into ruby_1_9_1. -- * vm_eval.c (rb_f_catch): gets rid of issue with gcc 4.4. a patch from Alexey Froloff in [ruby-core:23398]. [ruby-core:22924] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23515 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_eval.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vm_eval.c') diff --git a/vm_eval.c b/vm_eval.c index aaef1c71ae..0ec847882a 100644 --- a/vm_eval.c +++ b/vm_eval.c @@ -1232,7 +1232,7 @@ rb_f_catch(int argc, VALUE *argv) { VALUE tag; int state; - VALUE val = Qnil; /* OK */ + volatile VALUE val = Qnil; /* OK */ rb_thread_t *th = GET_THREAD(); rb_control_frame_t *saved_cfp = th->cfp; -- cgit v1.2.3