diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-06-25 04:10:34 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-06-25 04:10:34 +0100 |
| commit | e973acde81462de0c205f27db2642a08022fb3a8 (patch) | |
| tree | c6862ead76ae12979b3c3d6d1ec20774884c72ef /py/objfloat.c | |
| parent | 780e54cdc3491409060f90003ca64fcdd3f9f1e6 (diff) | |
| parent | 939c2e7f448fbe6b44d0079d2fc33c7ac7eb32d0 (diff) | |
| download | micropython-e973acde81462de0c205f27db2642a08022fb3a8.tar.gz micropython-e973acde81462de0c205f27db2642a08022fb3a8.zip | |
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'py/objfloat.c')
| -rw-r--r-- | py/objfloat.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/py/objfloat.c b/py/objfloat.c index b608b1a3d7..e3fefad8db 100644 --- a/py/objfloat.c +++ b/py/objfloat.c @@ -102,9 +102,12 @@ STATIC mp_obj_t float_unary_op(int op, mp_obj_t o_in) { STATIC mp_obj_t float_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) { mp_obj_float_t *lhs = lhs_in; +#if MICROPY_PY_BUILTINS_COMPLEX if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_complex)) { return mp_obj_complex_binary_op(op, lhs->value, 0, rhs_in); - } else { + } else +#endif + { return mp_obj_float_binary_op(op, lhs->value, rhs_in); } } |