admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2014-04-15 10:55:46 +09:00
parent 6e0c48d758 f3f99fa2cd
commit 5138f62d6b
17 changed files with 2018 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/string.c
+1 -1
View File
@@ -2586,7 +2586,7 @@ mrb_init_string(mrb_state *mrb)
{
struct RClass *s;
s = mrb->string_class = mrb_define_class(mrb, "String", mrb->object_class);
s = mrb->string_class = mrb_define_class(mrb, "String", mrb->object_class); /* 15.2.10 */
MRB_SET_INSTANCE_TT(s, MRB_TT_STRING);
mrb_define_method(mrb, s, "bytesize", mrb_str_bytesize, MRB_ARGS_NONE());