summaryrefslogtreecommitdiff
path: root/thread.c
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-29 22:44:51 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-29 22:44:51 +0000
commitc86379402c8dfeab9504c39c2de435601d408e57 (patch)
tree98dc49275de42c46c5ab90da4f67236baef92545 /thread.c
parent0c3f23ae7c60798e1c40421eb2924bcd1e063f25 (diff)
* 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
Diffstat (limited to 'thread.c')
-rw-r--r--thread.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/thread.c b/thread.c
index cd02f3de44..8dfe5b49f2 100644
--- a/thread.c
+++ b/thread.c
@@ -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;