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/array.c | |
| parent | d04f6abb00051465f59be4cda54e593a64923f8e (diff) | |
| parent | fc63ef150b029fcd5c73a0b9fde60d44a4a1d662 (diff) | |
| download | mruby-04d9c5ea6bfbdaf425526cf3556704f6b9fd0971.tar.gz mruby-04d9c5ea6bfbdaf425526cf3556704f6b9fd0971.zip | |
resolve conflict regarding backtick
Diffstat (limited to 'src/array.c')
| -rw-r--r-- | src/array.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/array.c b/src/array.c index f5d82d326..bfdb1bb97 100644 --- a/src/array.c +++ b/src/array.c @@ -301,7 +301,7 @@ mrb_ary_cmp(mrb_state *mrb, mrb_value ary1) a1 = RARRAY(ary1); a2 = RARRAY(ary2); if (a1->len == a2->len && a1->ptr == a2->ptr) return mrb_fixnum_value(0); else { - mrb_sym cmp = mrb_intern(mrb, "<=>"); + mrb_sym cmp = mrb_intern2(mrb, "<=>", 3); len = RARRAY_LEN(ary1); if (len > RARRAY_LEN(ary2)) { @@ -1069,7 +1069,7 @@ mrb_ary_equal(mrb_state *mrb, mrb_value ary1) equal_p = 0; } else if (!mrb_array_p(ary2)) { - if (!mrb_respond_to(mrb, ary2, mrb_intern(mrb, "to_ary"))) { + if (!mrb_respond_to(mrb, ary2, mrb_intern2(mrb, "to_ary", 6))) { equal_p = 0; } else { |