commit 97209d38e17a0f3cb2a2d3f03d726fd322b4808f
author Damien George <damien.p.george@gmail.com> Tue Jan 07 15:58:30 2014 +0000
committer Damien George <damien.p.george@gmail.com> Tue Jan 07 15:58:30 2014 +0000
tree 514cc35179713b4128ec6218829d769d87d7fe70
parent d49420e74c721bb6c61925a6c9a2addbaeed3382
parent a5a01df81d01705b9f04264cc46fbb1bc32641b3

Merge branch 'cplusplus' of https://github.com/ian-v/micropython into ian-v-cplusplus

Conflicts:
	py/objcomplex.c

py/objset.c

diff --git a/py/objset.c b/py/objset.c
index dd9a4d1..67dab11 100644
--- a/py/objset.c
+++ b/py/objset.c
@@ -57,14 +57,8 @@
 const mp_obj_type_t set_type = {
     { &mp_const_type },
     "set",
-    set_print, // print
-    set_make_new, // make_new
-    NULL, // call_n
-    NULL, // unary_op
-    NULL, // binary_op
-    NULL, // getiter
-    NULL, // iternext
-    .methods = { { NULL, NULL }, },
+    .print = set_print,
+    .make_new = set_make_new,
 };
 
 mp_obj_t mp_obj_new_set(int n_args, mp_obj_t *items) {