diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-29 22:44:51 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-29 22:44:51 +0000 |
commit | c86379402c8dfeab9504c39c2de435601d408e57 (patch) | |
tree | 98dc49275de42c46c5ab90da4f67236baef92545 | |
parent | 0c3f23ae7c60798e1c40421eb2924bcd1e063f25 (diff) | |
download | ruby-c86379402c8dfeab9504c39c2de435601d408e57.tar.gz |
* thread.c (rb_thread_interrupted): avoid warning of
implicit conversion.
* thread.c (rb_threadptr_execute_interrupts): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38009 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | thread.c | 4 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Fri Nov 30 07:43:44 2012 Koichi Sasada <ko1@atdot.net> + + * thread.c (rb_thread_interrupted): avoid warning of + implicit conversion. + + * thread.c (rb_threadptr_execute_interrupts): ditto. + Fri Nov 30 07:34:28 2012 Koichi Sasada <ko1@atdot.net> * vm_backtrace.c: add GC guards. @@ -1029,7 +1029,7 @@ rb_thread_interrupted(VALUE thval) { rb_thread_t *th; GetThreadPtr(thval, th); - return RUBY_VM_INTERRUPTED(th); + return (int)RUBY_VM_INTERRUPTED(th); } void @@ -1760,7 +1760,7 @@ rb_threadptr_execute_interrupts(rb_thread_t *th, int blocking_timing) old = ATOMIC_CAS(th->interrupt_flag, interrupt, interrupt & th->interrupt_mask); } while (old != interrupt); - interrupt &= ~th->interrupt_mask; + interrupt &= (rb_atomic_t)~th->interrupt_mask; if (!interrupt) return; |