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/variable.c | |
| parent | d04f6abb00051465f59be4cda54e593a64923f8e (diff) | |
| parent | fc63ef150b029fcd5c73a0b9fde60d44a4a1d662 (diff) | |
| download | mruby-04d9c5ea6bfbdaf425526cf3556704f6b9fd0971.tar.gz mruby-04d9c5ea6bfbdaf425526cf3556704f6b9fd0971.zip | |
resolve conflict regarding backtick
Diffstat (limited to 'src/variable.c')
| -rw-r--r-- | src/variable.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/variable.c b/src/variable.c index 850999042..4345f49a7 100644 --- a/src/variable.c +++ b/src/variable.c @@ -832,7 +832,7 @@ L_RETRY: goto L_RETRY; } c = base; - cm = mrb_intern(mrb, "const_missing"); + cm = mrb_intern2(mrb, "const_missing", 13); while (c) { if (mrb_respond_to(mrb, mrb_obj_value(c), cm)) { mrb_value name = mrb_symbol_value(sym); @@ -1047,7 +1047,7 @@ mrb_class_sym(mrb_state *mrb, struct RClass *c, struct RClass *outer) { mrb_value name; - name = mrb_obj_iv_get(mrb, (struct RObject*)c, mrb_intern(mrb, "__classid__")); + name = mrb_obj_iv_get(mrb, (struct RObject*)c, mrb_intern2(mrb, "__classid__", 11)); if (mrb_nil_p(name)) { if (!outer) return 0; |