diff options
| author | Damien George | 2014-05-02 16:58:32 +0100 |
|---|---|---|
| committer | Damien George | 2014-05-02 16:58:32 +0100 |
| commit | 003977a70bc913b25885231021e4176caba6f05d (patch) | |
| tree | dc2cdbb181f936d0db13939fb2ead5dbc3b3851b /py/objtype.c | |
| parent | 3eb8163b16bc5b6ea30428b54dee60e5c7e9c98f (diff) | |
| parent | 26a99207354787cd010b833c6ea8ad348c793820 (diff) | |
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'py/objtype.c')
| -rw-r--r-- | py/objtype.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/py/objtype.c b/py/objtype.c index dfaa3ff43..0eb09e583 100644 --- a/py/objtype.c +++ b/py/objtype.c @@ -3,9 +3,9 @@ #include <string.h> #include <assert.h> +#include "mpconfig.h" #include "nlr.h" #include "misc.h" -#include "mpconfig.h" #include "qstr.h" #include "obj.h" #include "runtime0.h" @@ -189,7 +189,7 @@ STATIC mp_obj_t class_make_new(mp_obj_t self_in, uint n_args, uint n_kw, const m // now call Python class __init__ function with all args mp_obj_t init_ret; if (n_args == 0 && n_kw == 0) { - init_ret = mp_call_function_n_kw(init_fn[0], 1, 0, (mp_obj_t*)&o); + init_ret = mp_call_function_n_kw(init_fn[0], 1, 0, (mp_obj_t*)(void*)&o); } else { mp_obj_t *args2 = m_new(mp_obj_t, 1 + n_args + 2 * n_kw); args2[0] = o; |