mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
merge revision(s) 17483:
* string.c (rb_str_buf_append): should infect. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17484 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
407d2fb298
commit
82ea308dcf
3 changed files with 8 additions and 2 deletions
|
@ -1,3 +1,7 @@
|
||||||
|
Fri Jun 20 18:23:09 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* string.c (rb_str_buf_append): should infect.
|
||||||
|
|
||||||
Fri Jun 20 15:51:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Fri Jun 20 15:51:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* array.c (rb_ary_store, rb_ary_splice): not depend on unspecified
|
* array.c (rb_ary_store, rb_ary_splice): not depend on unspecified
|
||||||
|
|
4
string.c
4
string.c
|
@ -775,7 +775,9 @@ VALUE
|
||||||
rb_str_buf_append(str, str2)
|
rb_str_buf_append(str, str2)
|
||||||
VALUE str, str2;
|
VALUE str, str2;
|
||||||
{
|
{
|
||||||
return str_buf_cat(str, RSTRING(str2)->ptr, RSTRING(str2)->len);
|
str_buf_cat(str, RSTRING(str2)->ptr, RSTRING(str2)->len);
|
||||||
|
OBJ_INFECT(str, str2);
|
||||||
|
return str;
|
||||||
}
|
}
|
||||||
|
|
||||||
VALUE
|
VALUE
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#define RUBY_RELEASE_DATE "2008-06-20"
|
#define RUBY_RELEASE_DATE "2008-06-20"
|
||||||
#define RUBY_VERSION_CODE 185
|
#define RUBY_VERSION_CODE 185
|
||||||
#define RUBY_RELEASE_CODE 20080620
|
#define RUBY_RELEASE_CODE 20080620
|
||||||
#define RUBY_PATCHLEVEL 230
|
#define RUBY_PATCHLEVEL 231
|
||||||
|
|
||||||
#define RUBY_VERSION_MAJOR 1
|
#define RUBY_VERSION_MAJOR 1
|
||||||
#define RUBY_VERSION_MINOR 8
|
#define RUBY_VERSION_MINOR 8
|
||||||
|
|
Loading…
Add table
Reference in a new issue