зеркало из https://github.com/github/ruby.git
* enc/unicode.c: fix implicit conversion error with clang. fixup r53548.
* string.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53552 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
203e604f46
Коммит
219467abde
|
@ -1,3 +1,8 @@
|
|||
Sat Jan 16 10:51:19 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org>
|
||||
|
||||
* enc/unicode.c: fix implicit conversion error with clang. fixup r53548.
|
||||
* string.c: ditto.
|
||||
|
||||
Sat Jan 16 10:31:00 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org>
|
||||
|
||||
* common.mk: test-sample was changed to test-basic.
|
||||
|
|
|
@ -630,5 +630,5 @@ onigenc_unicode_case_map(OnigCaseFoldType* flags,
|
|||
}
|
||||
to += ONIGENC_CODE_TO_MBC(enc, code, to);
|
||||
}
|
||||
return to-to_start;
|
||||
return (int)(to-to_start);
|
||||
}
|
||||
|
|
2
string.c
2
string.c
|
@ -5672,7 +5672,7 @@ rb_str_casemap(VALUE source, OnigCaseFoldType *flags, rb_encoding *enc)
|
|||
|
||||
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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче