diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-29 05:30:50 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-29 05:30:50 +0000 |
| commit | 56eee285be2e18f727ef15d58e338b134c3ab210 (patch) | |
| tree | aed87dd85181c76b099fc5c620ac1606f65f09c8 /string.c | |
| parent | 106f033b89fed268fe376ebaf16cb95fda655e6a (diff) | |
| download | ruby-56eee285be2e18f727ef15d58e338b134c3ab210.tar.gz | |
revert r52336 (commit miss)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52337 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
| -rw-r--r-- | string.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1617,7 +1617,7 @@ rb_str_plus(VALUE str1, VALUE str2) TERM_FILL(&ptr3[len1+len2], rb_enc_mbminlen(enc)); FL_SET_RAW(str3, OBJ_TAINTED_RAW(str1) | OBJ_TAINTED_RAW(str2)); - ENCODING_CODERANGE_SET(str3, enc_to_index(enc), + ENCODING_CODERANGE_SET(str3, rb_enc_to_index(enc), ENC_CODERANGE_AND(ENC_CODERANGE(str1), ENC_CODERANGE(str2))); RB_GC_GUARD(str1); RB_GC_GUARD(str2); |