diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-26 00:57:30 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-26 00:57:30 +0000 |
commit | ac24e257abc6d315b84072171a792b20d8b9d7a6 (patch) | |
tree | ea7391b8d9612fbcb1c90e78657db5b64beb3756 | |
parent | e559b24b526bd4d2559283ed2640681595b5ff3d (diff) |
* 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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@39503 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | st.c | 2 | ||||
-rw-r--r-- | thread.c | 2 | ||||
-rw-r--r-- | version.h | 6 |
4 files changed, 14 insertions, 5 deletions
@@ -1,3 +1,12 @@ +Tue Feb 26 09:53:59 2013 NARUSE, Yui <naruse@ruby-lang.org> + + * 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@tenderlovemaking.com> * lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit): @@ -515,7 +515,7 @@ st_add_direct(st_table *table, st_data_t key, st_data_t value) 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; @@ -2161,7 +2161,7 @@ thread_keys_i(ID key, VALUE value, VALUE ary) static int vm_living_thread_num(rb_vm_t *vm) { - return vm->living_threads->num_entries; + return (int)vm->living_threads->num_entries; } int @@ -1,10 +1,10 @@ #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" |