diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-07-31 13:47:06 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-07-31 13:47:06 +0000 |
| commit | 8cc2018d47bc15a1b10295965fc0ccd27c0dcbba (patch) | |
| tree | 5e8ba4bed5de1f1973203b9cff2c8aab78b419fc /py/objbool.c | |
| parent | c9aa58e6381018cca2513e3468363af0b5442d1f (diff) | |
| parent | bb4c6f35c627ab3487cdd6bafb4588cc633cd6a4 (diff) | |
Merge branch 'master' of https://github.com/micropython/micropython
Diffstat (limited to 'py/objbool.c')
| -rw-r--r-- | py/objbool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/py/objbool.c b/py/objbool.c index 9bf30d423..72535b297 100644 --- a/py/objbool.c +++ b/py/objbool.c @@ -74,7 +74,7 @@ STATIC mp_obj_t bool_unary_op(int op, mp_obj_t o_in) { STATIC mp_obj_t bool_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) { if (MP_BINARY_OP_OR <= op && op <= MP_BINARY_OP_NOT_EQUAL) { - return mp_binary_op(op, MP_OBJ_NEW_SMALL_INT((mp_int_t)mp_obj_is_true(lhs_in)), rhs_in); + return mp_binary_op(op, MP_OBJ_NEW_SMALL_INT(mp_obj_is_true(lhs_in)), rhs_in); } return MP_OBJ_NULL; // op not supported } |