diff options
| author | Paolo Bosetti <[email protected]> | 2012-08-16 10:12:40 +0200 |
|---|---|---|
| committer | Paolo Bosetti <[email protected]> | 2012-08-16 10:18:41 +0200 |
| commit | efa46146a58be501daf3a38a15ffa9e3ddc87508 (patch) | |
| tree | ce57dbd7dba008363513f881599783c1342cdd51 /src/object.c | |
| parent | 441079557d8e78f33314aea14b31cc22932d0ff4 (diff) | |
| parent | 23e88dba6e9cfaded527f477341e7a7fe50e6795 (diff) | |
| download | mruby-efa46146a58be501daf3a38a15ffa9e3ddc87508.tar.gz mruby-efa46146a58be501daf3a38a15ffa9e3ddc87508.zip | |
Merge branch 'master' into XCode
Also, fixed issue in Xcode project build settings
Diffstat (limited to 'src/object.c')
| -rw-r--r-- | src/object.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/object.c b/src/object.c index 20310d288..4c494101a 100644 --- a/src/object.c +++ b/src/object.c @@ -14,8 +14,8 @@ int mrb_obj_eq(mrb_state *mrb, mrb_value v1, mrb_value v2) { - if (v1.tt != v2.tt) return FALSE; - switch (v1.tt) { + if (mrb_type(v1) != mrb_type(v2)) return FALSE; + switch (mrb_type(v1)) { case MRB_TT_TRUE: return 1; @@ -26,7 +26,7 @@ mrb_obj_eq(mrb_state *mrb, mrb_value v1, mrb_value v2) return (v1.value.sym == v2.value.sym); case MRB_TT_FLOAT: - return (v1.value.f == v2.value.f); + return (mrb_float(v1) == mrb_float(v2)); default: return (v1.value.p == v2.value.p); |