diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2016-08-06 16:18:03 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2016-08-06 16:18:03 +0300 |
| commit | cbef0dba2eef29757237dfe4bca3d21e6a81a0ba (patch) | |
| tree | 34578c6a050ddac3c188d22488a14ad2fd8f029a | |
| parent | e0d49b7e1bea90e742e6db81ec91903fd8755c3c (diff) | |
| download | micropython-cbef0dba2eef29757237dfe4bca3d21e6a81a0ba.tar.gz micropython-cbef0dba2eef29757237dfe4bca3d21e6a81a0ba.zip | |
extmod/modwebsocket: Use mp_rom_map_elem_t and friends.
| -rw-r--r-- | extmod/modwebsocket.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/extmod/modwebsocket.c b/extmod/modwebsocket.c index a4d5ae2749..f46dac1773 100644 --- a/extmod/modwebsocket.c +++ b/extmod/modwebsocket.c @@ -280,13 +280,13 @@ STATIC mp_obj_t websocket_close(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(websocket_close_obj, websocket_close); -STATIC const mp_map_elem_t websocket_locals_dict_table[] = { - { MP_OBJ_NEW_QSTR(MP_QSTR_read), (mp_obj_t)&mp_stream_read_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR_readinto), (mp_obj_t)&mp_stream_readinto_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR_readline), (mp_obj_t)&mp_stream_unbuffered_readline_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR_write), (mp_obj_t)&mp_stream_write_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR_ioctl), (mp_obj_t)&mp_stream_ioctl_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR_close), (mp_obj_t)&websocket_close_obj }, +STATIC const mp_rom_map_elem_t websocket_locals_dict_table[] = { + { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) }, + { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) }, + { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) }, + { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) }, + { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&mp_stream_ioctl_obj) }, + { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&websocket_close_obj) }, }; STATIC MP_DEFINE_CONST_DICT(websocket_locals_dict, websocket_locals_dict_table); @@ -301,12 +301,12 @@ STATIC const mp_obj_type_t websocket_type = { .name = MP_QSTR_websocket, .make_new = websocket_make_new, .protocol = &websocket_stream_p, - .locals_dict = (mp_obj_t)&websocket_locals_dict, + .locals_dict = (void*)&websocket_locals_dict, }; -STATIC const mp_map_elem_t websocket_module_globals_table[] = { - { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_websocket) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_websocket), (mp_obj_t)&websocket_type }, +STATIC const mp_rom_map_elem_t websocket_module_globals_table[] = { + { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_websocket) }, + { MP_ROM_QSTR(MP_QSTR_websocket), MP_ROM_PTR(&websocket_type) }, }; STATIC MP_DEFINE_CONST_DICT(websocket_module_globals, websocket_module_globals_table); |