Merge branch 'cplusplus' of https://github.com/ian-v/micropython into ian-v-cplusplus
Conflicts:
py/objcomplex.c
diff --git a/unix/main.c b/unix/main.c
index f7277b9..920aed3 100644
--- a/unix/main.c
+++ b/unix/main.c
@@ -154,7 +154,7 @@
typedef struct _test_obj_t {
mp_obj_base_t base;
- bool value;
+ int value;
} test_obj_t;
static void test_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in) {
@@ -176,15 +176,17 @@
static MP_DEFINE_CONST_FUN_OBJ_1(test_get_obj, test_get);
static MP_DEFINE_CONST_FUN_OBJ_2(test_set_obj, test_set);
+static const mp_method_t test_methods[] = {
+ { "get", &test_get_obj },
+ { "set", &test_set_obj },
+ { NULL, NULL },
+};
+
static const mp_obj_type_t test_type = {
{ &mp_const_type },
"Test",
.print = test_print,
- .methods = {
- { "get", &test_get_obj },
- { "set", &test_set_obj },
- { NULL, NULL },
- }
+ .methods = test_methods,
};
mp_obj_t test_obj_new(int value) {