summaryrefslogtreecommitdiffhomepage
path: root/src/string.c
diff options
context:
space:
mode:
authorDaniel Bovensiepen <[email protected]>2012-09-19 09:36:35 +0900
committerDaniel Bovensiepen <[email protected]>2012-09-19 09:36:35 +0900
commitc0ff4fed3b721ae5892f3644e57b51551a612c0d (patch)
tree272807d44ec0025a2f64ef79301f3131630f4642 /src/string.c
parent17c877011d2ecaba8a904f1b5b87a4aa2f5a82bb (diff)
parent1afda93c7ae70d85e713a2a44e9c32dd604f1a5a (diff)
downloadmruby-c0ff4fed3b721ae5892f3644e57b51551a612c0d.tar.gz
mruby-c0ff4fed3b721ae5892f3644e57b51551a612c0d.zip
Merge remote-tracking branch 'upstream/master' into mrbgems
Diffstat (limited to 'src/string.c')
-rw-r--r--src/string.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/string.c b/src/string.c
index 7077e9dfd..57bbbc831 100644
--- a/src/string.c
+++ b/src/string.c
@@ -379,7 +379,10 @@ mrb_str_plus(mrb_state *mrb, mrb_value a, mrb_value b)
static mrb_value
mrb_str_plus_m(mrb_state *mrb, mrb_value self)
{
- return mrb_nil_value();
+ mrb_value str;
+
+ mrb_get_args(mrb, "S", &str);
+ return mrb_str_plus(mrb, self, str);
}
/*