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

ruby-changes:27451

From: usa <ko1@a...>
Date: Tue, 26 Feb 2013 09:57:41 +0900 (JST)
Subject: [ruby-changes:27451] usa:r39503 (ruby_1_9_3): * st.c (st_add_direct): int is not always same with st_index_t. some

usa	2013-02-26 09:57:30 +0900 (Tue, 26 Feb 2013)

  New Revision: 39503

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

  Log:
    * st.c (st_add_direct): int is not always same with st_index_t.  some
      version of clang reports error.
    
    * thread.c (vm_living_thread_num): ditto.
      reported by d6rkaiz (Isao Sugimoto) at [ruby-dev:47096]
      [Backport #7946]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/st.c
    branches/ruby_1_9_3/thread.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 39502)
+++ ruby_1_9_3/ChangeLog	(revision 39503)
@@ -1,3 +1,12 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Tue Feb 26 09:53:59 2013  NARUSE, Yui  <naruse@r...>
+
+	* st.c (st_add_direct): int is not always same with st_index_t.  some
+	  version of clang reports error.
+
+	* thread.c (vm_living_thread_num): ditto.
+	  reported by d6rkaiz (Isao Sugimoto) at [ruby-dev:47096]
+	  [Backport #7946]
+
 Fri Feb 22 18:36:51 2013  Aaron Patterson <aaron@t...>
 
 	* lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit):
Index: ruby_1_9_3/st.c
===================================================================
--- ruby_1_9_3/st.c	(revision 39502)
+++ ruby_1_9_3/st.c	(revision 39503)
@@ -515,7 +515,7 @@ st_add_direct(st_table *table, st_data_t https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/st.c#L515
     st_index_t hash_val, bin_pos;
 
     if (table->entries_packed) {
-        int i;
+        st_index_t i;
         if (MORE_PACKABLE_P(table)) {
             i = table->num_entries++;
             table->bins[i*2] = (struct st_table_entry*)key;
Index: ruby_1_9_3/thread.c
===================================================================
--- ruby_1_9_3/thread.c	(revision 39502)
+++ ruby_1_9_3/thread.c	(revision 39503)
@@ -2161,7 +2161,7 @@ thread_keys_i(ID key, VALUE value, VALUE https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/thread.c#L2161
 static int
 vm_living_thread_num(rb_vm_t *vm)
 {
-    return vm->living_threads->num_entries;
+    return (int)vm->living_threads->num_entries;
 }
 
 int
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 39502)
+++ ruby_1_9_3/version.h	(revision 39503)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 392
+#define RUBY_PATCHLEVEL 393
 
-#define RUBY_RELEASE_DATE "2013-02-22"
+#define RUBY_RELEASE_DATE "2013-02-26"
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 22
+#define RUBY_RELEASE_DAY 26
 
 #include "ruby/version.h"
 

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

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