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/objint.c | |
| parent | c9aa58e6381018cca2513e3468363af0b5442d1f (diff) | |
| parent | bb4c6f35c627ab3487cdd6bafb4588cc633cd6a4 (diff) | |
Merge branch 'master' of https://github.com/micropython/micropython
Diffstat (limited to 'py/objint.c')
| -rw-r--r-- | py/objint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/py/objint.c b/py/objint.c index e351c3f39..c08bf7da6 100644 --- a/py/objint.c +++ b/py/objint.c @@ -64,7 +64,7 @@ STATIC mp_obj_t mp_obj_int_make_new(mp_obj_t type_in, uint n_args, uint n_kw, co return mp_parse_num_integer(s, l, 0); #if MICROPY_PY_BUILTINS_FLOAT } else if (MP_OBJ_IS_TYPE(args[0], &mp_type_float)) { - return MP_OBJ_NEW_SMALL_INT((mp_int_t)(MICROPY_FLOAT_C_FUN(trunc)(mp_obj_float_get(args[0])))); + return MP_OBJ_NEW_SMALL_INT((MICROPY_FLOAT_C_FUN(trunc)(mp_obj_float_get(args[0])))); #endif } else { // try to convert to small int (eg from bool) |