зеркало из https://github.com/github/ruby.git
* 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
This commit is contained in:
Родитель
0c3f23ae7c
Коммит
c86379402c
|
@ -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.
|
||||
|
|
4
thread.c
4
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;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче