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/objslice.c | |
parent | d49420e74c721bb6c61925a6c9a2addbaeed3382 (diff) | |
parent | a5a01df81d01705b9f04264cc46fbb1bc32641b3 (diff) |
Merge branch 'cplusplus' of https://github.com/ian-v/micropython into ian-v-cplusplus
Conflicts:
py/objcomplex.c
Diffstat (limited to 'py/objslice.c')
-rw-r--r-- | py/objslice.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/py/objslice.c b/py/objslice.c index da69b92af..d95ccef06 100644 --- a/py/objslice.c +++ b/py/objslice.c @@ -23,14 +23,7 @@ void ellipsis_print(void (*print)(void *env, const char *fmt, ...), void *env, m const mp_obj_type_t ellipsis_type = { { &mp_const_type }, "ellipsis", - ellipsis_print, // print - NULL, // make_new - NULL, // call_n - NULL, // unary_op - NULL, // binary_op - NULL, // getiter - NULL, // iternext - .methods = {{NULL, NULL},}, + .print = ellipsis_print, }; static const mp_obj_ellipsis_t ellipsis_obj = {{&ellipsis_type}}; @@ -58,7 +51,6 @@ const mp_obj_type_t slice_type = { { &mp_const_type }, "slice", .print = slice_print, - .methods = { { NULL, NULL }, }, }; // TODO: Make sure to handle "empty" values, which are signified by None in CPython |