diff options
| author | Yukihiro Matz Matsumoto <[email protected]> | 2013-03-23 11:08:18 +0900 |
|---|---|---|
| committer | Yukihiro Matz Matsumoto <[email protected]> | 2013-03-23 11:08:18 +0900 |
| commit | 04d9c5ea6bfbdaf425526cf3556704f6b9fd0971 (patch) | |
| tree | c1659854546676c402a25679b8236ec467a6ef3d /src/string.c | |
| parent | d04f6abb00051465f59be4cda54e593a64923f8e (diff) | |
| parent | fc63ef150b029fcd5c73a0b9fde60d44a4a1d662 (diff) | |
| download | mruby-04d9c5ea6bfbdaf425526cf3556704f6b9fd0971.tar.gz mruby-04d9c5ea6bfbdaf425526cf3556704f6b9fd0971.zip | |
resolve conflict regarding backtick
Diffstat (limited to 'src/string.c')
| -rw-r--r-- | src/string.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/string.c b/src/string.c index 8f16a4ef0..97d53cd6c 100644 --- a/src/string.c +++ b/src/string.c @@ -532,10 +532,10 @@ mrb_str_cmp_m(mrb_state *mrb, mrb_value str1) mrb_get_args(mrb, "o", &str2); if (!mrb_string_p(str2)) { - if (!mrb_respond_to(mrb, str2, mrb_intern(mrb, "to_s"))) { + if (!mrb_respond_to(mrb, str2, mrb_intern2(mrb, "to_s", 4))) { return mrb_nil_value(); } - else if (!mrb_respond_to(mrb, str2, mrb_intern(mrb, "<=>"))) { + else if (!mrb_respond_to(mrb, str2, mrb_intern2(mrb, "<=>", 3))) { return mrb_nil_value(); } else { @@ -572,7 +572,7 @@ mrb_str_equal(mrb_state *mrb, mrb_value str1, mrb_value str2) if (mrb_obj_equal(mrb, str1, str2)) return TRUE; if (!mrb_string_p(str2)) { if (mrb_nil_p(str2)) return FALSE; - if (!mrb_respond_to(mrb, str2, mrb_intern(mrb, "to_str"))) { + if (!mrb_respond_to(mrb, str2, mrb_intern2(mrb, "to_str", 6))) { return FALSE; } str2 = mrb_funcall(mrb, str2, "to_str", 0); |