nobu	2010-05-23 17:16:40 +0900 (Sun, 23 May 2010)

  New Revision: 27965

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

  Log:
    * include/ruby/ruby.h (CONST_ID_CACHE, rb_intern_const): suppress
      warnings with -Wconversion.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/include/ruby/ruby.h

Index: ruby_1_9_2/include/ruby/ruby.h
===================================================================
--- ruby_1_9_2/include/ruby/ruby.h	(revision 27964)
+++ ruby_1_9_2/include/ruby/ruby.h	(revision 27965)
@@ -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: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 27964)
+++ ruby_1_9_2/ChangeLog	(revision 27965)
@@ -1,3 +1,8 @@
+Sun May 23 17:16:37 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* include/ruby/ruby.h (CONST_ID_CACHE, rb_intern_const): suppress
+	  warnings with -Wconversion.
+
 Sat May 22 06:46:45 2010  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* cont.c: revert FIBER_USE_NATIVE feature.

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