[前][次][番号順一覧][スレッド一覧]

ruby-changes:25952

From: ko1 <ko1@a...>
Date: Fri, 30 Nov 2012 07:53:00 +0900 (JST)
Subject: [ruby-changes:25952] ko1:r38009 (trunk): * thread.c (rb_thread_interrupted): avoid warning of

ko1	2012-11-30 07:44:51 +0900 (Fri, 30 Nov 2012)

  New Revision: 38009

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=38009

  Log:
    * thread.c (rb_thread_interrupted): avoid warning of
      implicit conversion.
    * thread.c (rb_threadptr_execute_interrupts): ditto.

  Modified files:
    trunk/ChangeLog
    trunk/thread.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 38008)
+++ ChangeLog	(revision 38009)
@@ -1,3 +1,10 @@
+Fri Nov 30 07:43:44 2012  Koichi Sasada  <ko1@a...>
+
+	* 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@a...>
 
 	* vm_backtrace.c: add GC guards.
Index: thread.c
===================================================================
--- thread.c	(revision 38008)
+++ thread.c	(revision 38009)
@@ -1029,7 +1029,7 @@
 {
     rb_thread_t *th;
     GetThreadPtr(thval, th);
-    return RUBY_VM_INTERRUPTED(th);
+    return (int)RUBY_VM_INTERRUPTED(th);
 }
 
 void
@@ -1760,7 +1760,7 @@
 	    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;
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]