hsbt	2016-01-16 10:51:58 +0900 (Sat, 16 Jan 2016)

  New Revision: 53552

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=53552

  Log:
    * enc/unicode.c: fix implicit conversion error with clang. fixup r53548.
    * string.c: ditto.

  Modified files:
    trunk/ChangeLog
    trunk/enc/unicode.c
    trunk/string.c
Index: string.c
===================================================================
--- string.c	(revision 53551)
+++ string.c	(revision 53552)
@@ -5672,7 +5672,7 @@ rb_str_casemap(VALUE source, OnigCaseFol https://github.com/ruby/ruby/blob/trunk/string.c#L5672
 
     while (source_current < source_end) {
 	/* increase multiplier using buffer count to converge quickly */
-	int capa = (source_end-source_current)*++buffer_count + CASE_MAPPING_ADDITIONAL_LENGTH;
+	int capa = (int)(source_end-source_current)*++buffer_count + CASE_MAPPING_ADDITIONAL_LENGTH;
 	current_buffer->next = (mapping_buffer*)ALLOC_N(char, sizeof(mapping_buffer)+capa);
 	current_buffer = current_buffer->next;
 	current_buffer->next = NULL;
Index: enc/unicode.c
===================================================================
--- enc/unicode.c	(revision 53551)
+++ enc/unicode.c	(revision 53552)
@@ -630,5 +630,5 @@ onigenc_unicode_case_map(OnigCaseFoldTyp https://github.com/ruby/ruby/blob/trunk/enc/unicode.c#L630
 	}
 	to += ONIGENC_CODE_TO_MBC(enc, code, to);
     }
-    return to-to_start;
+    return (int)(to-to_start);
 }
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 53551)
+++ ChangeLog	(revision 53552)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat Jan 16 10:51:19 2016  SHIBATA Hiroshi  <hsbt@r...>
+
+	* enc/unicode.c: fix implicit conversion error with clang. fixup r53548.
+	* string.c: ditto.
+
 Sat Jan 16 10:31:00 2016  SHIBATA Hiroshi  <hsbt@r...>
 
 	* common.mk: test-sample was changed to test-basic.

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