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.h | |
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.h')
-rw-r--r-- | py/obj.h | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -398,9 +398,10 @@ mp_obj_t mp_obj_new_bound_meth(mp_obj_t meth, mp_obj_t self); mp_obj_t mp_obj_new_getitem_iter(mp_obj_t *args); mp_obj_t mp_obj_new_module(qstr module_name); -mp_obj_type_t *mp_obj_get_type(mp_obj_t o_in); -const char *mp_obj_get_type_str(mp_obj_t o_in); +mp_obj_type_t *mp_obj_get_type(mp_const_obj_t o_in); +const char *mp_obj_get_type_str(mp_const_obj_t o_in); bool mp_obj_is_subclass_fast(mp_const_obj_t object, mp_const_obj_t classinfo); // arguments should be type objects +mp_obj_t mp_instance_cast_to_native_base(mp_const_obj_t self_in, mp_const_obj_t native_type); void mp_obj_print_helper(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t o_in, mp_print_kind_t kind); void mp_obj_print(mp_obj_t o, mp_print_kind_t kind); |