From d410639a6d422e0ae032f049ccfbbbb45b312d6f Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 12 Oct 2010 14:47:23 +0000
Subject: * compile.c (iseq_build_body), error.c (set_syserr, get_syserr),  
 (syserr_initialize), gc.c (define_final, rb_gc_copy_finalizer),  
 (run_final), hash.c (rb_hash_aref, rb_hash_lookup2),   (rb_hash_fetch_m,
 rb_hash_clear, rb_hash_aset, eql_i),   iseq.c (iseq_load, iseq_data_to_ary),
 marshal.c (r_symlink),   thread.c (rb_thread_local_aref),   variable.c
 (generic_ivar_remove, ivar_get, rb_const_get_0),   (rb_cvar_get), vm.c
 (rb_vm_check_redefinition_opt_method),   vm_insnhelper.c (vm_get_ev_const),
 vm_method.c (remove_method),   ext/iconv/iconv.c (map_charset): use
 st_data_t.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 thread.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'thread.c')

diff --git a/thread.c b/thread.c
index 3cdc8b79b8..294df1a258 100644
--- a/thread.c
+++ b/thread.c
@@ -1986,7 +1986,7 @@ VALUE
 rb_thread_local_aref(VALUE thread, ID id)
 {
     rb_thread_t *th;
-    VALUE val;
+    st_data_t val;
 
     GetThreadPtr(thread, th);
     if (rb_safe_level() >= 4 && th != GET_THREAD()) {
@@ -1996,7 +1996,7 @@ rb_thread_local_aref(VALUE thread, ID id)
 	return Qnil;
     }
     if (st_lookup(th->local_storage, id, &val)) {
-	return val;
+	return (VALUE)val;
     }
     return Qnil;
 }
-- 
cgit v1.2.3