ruby-changes:16014
From: nobu <ko1@a...>
Date: Sun, 23 May 2010 16:56:34 +0900 (JST)
Subject: [ruby-changes:16014] Ruby:r27963 (trunk): * include/ruby/ruby.h (CONST_ID_CACHE, rb_intern_const): suppress
nobu 2010-05-23 16:56:15 +0900 (Sun, 23 May 2010) New Revision: 27963 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27963 Log: * include/ruby/ruby.h (CONST_ID_CACHE, rb_intern_const): suppress warnings with -Wconversion. Modified files: trunk/ChangeLog trunk/include/ruby/ruby.h Index: include/ruby/ruby.h =================================================================== --- include/ruby/ruby.h (revision 27962) +++ include/ruby/ruby.h (revision 27963) @@ -1070,7 +1070,7 @@ { \ static ID rb_intern_id_cache; \ if (!rb_intern_id_cache) \ - rb_intern_id_cache = rb_intern2(str, strlen(str)); \ + rb_intern_id_cache = rb_intern2(str, (long)strlen(str)); \ result rb_intern_id_cache; \ } #define CONST_ID(var, str) \ @@ -1084,10 +1084,10 @@ rb_intern(str)) #define rb_intern_const(str) \ (__builtin_constant_p(str) ? \ - __extension__ (rb_intern2(str, strlen(str))) : \ + __extension__ (rb_intern2(str, (long)strlen(str))) : \ (rb_intern)(str)) #else -#define rb_intern_const(str) rb_intern2(str, strlen(str)) +#define rb_intern_const(str) rb_intern2(str, (long)strlen(str)) #endif const char *rb_class2name(VALUE); Index: ChangeLog =================================================================== --- ChangeLog (revision 27962) +++ ChangeLog (revision 27963) @@ -1,3 +1,8 @@ +Sun May 23 16:56:11 2010 Nobuyoshi Nakada <nobu@r...> + + * include/ruby/ruby.h (CONST_ID_CACHE, rb_intern_const): suppress + warnings with -Wconversion. + Sun May 23 07:08:34 2010 Aaron Patterson <aaron@t...> * ext/psych/lib/psych/json/stream.rb: adding a JSON streaming API -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/