diff options
author | Damien George <damien.p.george@gmail.com> | 2014-01-07 15:58:30 +0000 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-01-07 15:58:30 +0000 |
commit | 97209d38e17a0f3cb2a2d3f03d726fd322b4808f (patch) | |
tree | 514cc35179713b4128ec6218829d769d87d7fe70 /py/objdict.c | |
parent | d49420e74c721bb6c61925a6c9a2addbaeed3382 (diff) | |
parent | a5a01df81d01705b9f04264cc46fbb1bc32641b3 (diff) | |
download | micropython-97209d38e17a0f3cb2a2d3f03d726fd322b4808f.tar.gz micropython-97209d38e17a0f3cb2a2d3f03d726fd322b4808f.zip |
Merge branch 'cplusplus' of https://github.com/ian-v/micropython into ian-v-cplusplus
Conflicts:
py/objcomplex.c
Diffstat (limited to 'py/objdict.c')
-rw-r--r-- | py/objdict.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/py/objdict.c b/py/objdict.c index b3e21aedd2..66a442fbaa 100644 --- a/py/objdict.c +++ b/py/objdict.c @@ -66,8 +66,6 @@ const mp_obj_type_t dict_type = { .print = dict_print, .make_new = dict_make_new, .binary_op = dict_binary_op, - .getiter = NULL, - .methods = {{NULL, NULL},}, }; mp_obj_t mp_obj_new_dict(int n_args) { |