1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* thread.c (rb_thread_interrupted): avoid warning of

Browse Source 
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:
ko1 2012-11-29 22:44:51 +00:00
parent 0c3f23ae7c
commit c86379402c
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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> Fri Nov 30 07:34:28 2012 Koichi Sasada <ko1@atdot.net>
* vm_backtrace.c: add GC guards. * vm_backtrace.c: add GC guards.

4
thread.c
View File

@ -1029,7 +1029,7 @@ rb_thread_interrupted(VALUE thval)
{ {
rb_thread_t *th; rb_thread_t *th;
GetThreadPtr(thval, th); GetThreadPtr(thval, th);
return RUBY_VM_INTERRUPTED(th); return (int)RUBY_VM_INTERRUPTED(th);
} }
void 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); old = ATOMIC_CAS(th->interrupt_flag, interrupt, interrupt & th->interrupt_mask);
} while (old != interrupt); } while (old != interrupt);
interrupt &= ~th->interrupt_mask; interrupt &= (rb_atomic_t)~th->interrupt_mask;
if (!interrupt) if (!interrupt)
return; return;