diff options
author | Damien George <damien.p.george@gmail.com> | 2014-05-11 12:10:35 +0100 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-05-11 12:10:35 +0100 |
commit | 18ceb7055b43d158e46ff6d0a0389bc3cd05e5d5 (patch) | |
tree | f3b1ad5d9c242a8aec5c0dc58b876e6f57529f05 /py/obj.c | |
parent | a7a1a38df43958a267410d333f495db56a8b0902 (diff) | |
parent | eea01186547f0f1568ea1c8f002da4e33b7b0e46 (diff) | |
download | micropython-18ceb7055b43d158e46ff6d0a0389bc3cd05e5d5.tar.gz micropython-18ceb7055b43d158e46ff6d0a0389bc3cd05e5d5.zip |
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'py/obj.c')
-rw-r--r-- | py/obj.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -36,18 +36,18 @@ #include "runtime0.h" #include "runtime.h" -mp_obj_type_t *mp_obj_get_type(mp_obj_t o_in) { +mp_obj_type_t *mp_obj_get_type(mp_const_obj_t o_in) { if (MP_OBJ_IS_SMALL_INT(o_in)) { return (mp_obj_t)&mp_type_int; } else if (MP_OBJ_IS_QSTR(o_in)) { return (mp_obj_t)&mp_type_str; } else { - mp_obj_base_t *o = o_in; + const mp_obj_base_t *o = o_in; return (mp_obj_t)o->type; } } -const char *mp_obj_get_type_str(mp_obj_t o_in) { +const char *mp_obj_get_type_str(mp_const_obj_t o_in) { return qstr_str(mp_obj_get_type(o_in)->name); } |