diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-03-17 00:16:01 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-03-17 00:16:01 +0900 |
| commit | 3687e1f97b8a3fd058791d30f5d6f58285a627c6 (patch) | |
| tree | 95c83ace18e45d610145fa200406b1369a5fbe97 /src/object.c | |
| parent | 55c1942b43b1e62956e6ce1798dc10fe742d617c (diff) | |
| parent | 0d82ada9229cb01279e087246fcd1bcb4d5ddd29 (diff) | |
| download | mruby-3687e1f97b8a3fd058791d30f5d6f58285a627c6.tar.gz mruby-3687e1f97b8a3fd058791d30f5d6f58285a627c6.zip | |
Merge branch 'master' of github.com:mruby/mruby
Diffstat (limited to 'src/object.c')
| -rw-r--r-- | src/object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/object.c b/src/object.c index 5090e38cf..6d39254dd 100644 --- a/src/object.c +++ b/src/object.c @@ -338,7 +338,7 @@ mrb_convert_type(mrb_state *mrb, mrb_value val, enum mrb_vtype type, const char mrb_value v; if (mrb_type(val) == type) return val; - v = convert_type(mrb, val, tname, method, 1/*Qtrue*/); + v = convert_type(mrb, val, tname, method, TRUE); if (mrb_type(v) != type) { mrb_raisef(mrb, E_TYPE_ERROR, "%S cannot be converted to %S by #%S", val, mrb_str_new_cstr(mrb, tname), mrb_str_new_cstr(mrb, method)); @@ -352,7 +352,7 @@ mrb_check_convert_type(mrb_state *mrb, mrb_value val, enum mrb_vtype type, const mrb_value v; if (mrb_type(val) == type && type != MRB_TT_DATA) return val; - v = convert_type(mrb, val, tname, method, 0/*Qfalse*/); + v = convert_type(mrb, val, tname, method, FALSE); if (mrb_nil_p(v) || mrb_type(v) != type) return mrb_nil_value(); return v; } |