8000 unix/modjni: Convert to mp_rom_map_elem_t. · lable/micropython@e280122 · GitHub
[go: up one dir, main page]
Skip to content

Commit e280122

Browse files
pfalconpfalcon
committed
unix/modjni: Convert to mp_rom_map_elem_t.
1 parent f2140f9 commit e280122

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

‎unix/modjni.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,9 @@ STATIC mp_obj_t jclass_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
168168
return call_method(self->cls, NULL, methods, true, n_args, args);
169169
}
170170

171-
STATIC const mp_map_elem_t jclass_locals_dict_table[] = {
172-
// { MP_OBJ_NEW_QSTR(MP_QSTR_get), (mp_obj_t)&ffivar_get_obj },
173-
// { MP_OBJ_NEW_QSTR(MP_QSTR_set), (mp_obj_t)&ffivar_set_obj },
171+
STATIC const mp_rom_map_elem_t jclass_locals_dict_table[] = {
172+
// { MP_ROM_QSTR(MP_QSTR_get), MP_ROM_PTR(&ffivar_get_obj) },
173+
// { MP_ROM_QSTR(MP_QSTR_set), MP_ROM_PTR(&ffivar_set_obj) },
174174
};
175175

176176
STATIC MP_DEFINE_CONST_DICT(jclass_locals_dict, jclass_locals_dict_table);
@@ -181,7 +181,7 @@ STATIC const mp_obj_type_t jclass_type = {
181181
.print = jclass_print,
182182
.attr = jclass_attr,
183183
.call = jclass_call,
184-
.locals_dict = (mp_obj_t)&jclass_locals_dict,
184+
.locals_dict = (mp_obj_dict_t*)&jclass_locals_dict,
185185
};
186186

187187
STATIC mp_obj_t new_jclass(jclass jc) {
@@ -331,7 +331,7 @@ STATIC const mp_obj_type_t jobject_type = {
331331
.attr = jobject_attr,
332332
.subscr = jobject_subscr,
333333
.getiter = subscr_getiter,
334-
// .locals_dict = (mp_obj_t)&jobject_locals_dict,
334+
// .locals_dict = (mp_obj_dict_t*)&jobject_locals_dict,
335335
};
336336

337337
STATIC mp_obj_t new_jobject(jobject jo) {
@@ -578,7 +578,7 @@ STATIC const mp_obj_type_t jmethod_type = {
578578
.print = jmethod_print,
579579
.call = jmethod_call,
580580
// .attr = jobject_attr,
581-
// .locals_dict = (mp_obj_t)&jobject_locals_dict,
581+
// .locals_dict = (mp_obj_dict_t*)&jobject_locals_dict,
582582
};
583583

584584
#ifdef __ANDROID__
@@ -707,11 +707,11 @@ STATIC mp_obj_t mod_jni_env() {
707707
}
708708
MP_DEFINE_CONST_FUN_OBJ_0(mod_jni_env_obj, mod_jni_env);
709709

710-
STATIC const mp_map_elem_t mp_module_jni_globals_table[] = {
711-
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_jni) },
712-
{ MP_OBJ_NEW_QSTR(MP_QSTR_cls), (mp_obj_t)&mod_jni_cls_obj },
713-
{ MP_OBJ_NEW_QSTR(MP_QSTR_array), (mp_obj_t)&mod_jni_array_obj },
714-
{ MP_OBJ_NEW_QSTR(MP_QSTR_env), (mp_obj_t)&mod_jni_env_obj },
710+
STATIC const mp_rom_map_elem_t mp_module_jni_globals_table[] = {
711+
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_jni) },
712+
{ MP_ROM_QSTR(MP_QSTR_cls), MP_ROM_PTR(&mod_jni_cls_obj) },
713+
{ MP_ROM_QSTR(MP_QSTR_array), MP_ROM_PTR(&mod_jni_array_obj) },
714+
{ MP_ROM_QSTR(MP_QSTR_env), MP_ROM_PTR(&mod_jni_env_obj) },
715715
};
716716

717717
STATIC MP_DEFINE_CONST_DICT(mp_module_jni_globals, mp_module_jni_globals_table);

0 commit comments

Comments
 (0)
0