From 9c83ec0edac2394431a5d1aecba1d666ffdea0a3 Mon Sep 17 00:00:00 2001
From: "John R. Lenton" <jlenton@gmail.com>
Date: Tue, 7 Jan 2014 23:06:46 +0000
Subject: Merge remote-tracking branch 'upstream/master' into dict_feats

---
 py/objcomplex.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'py/objcomplex.c')

diff --git a/py/objcomplex.c b/py/objcomplex.c
index 46f43b54b5..1036bae420 100644
--- a/py/objcomplex.c
+++ b/py/objcomplex.c
@@ -87,14 +87,10 @@ static mp_obj_t complex_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
 const mp_obj_type_t complex_type = {
     { &mp_const_type },
     "complex",
-    complex_print, // print
-    complex_make_new, // make_new
-    NULL, // call_n
-    complex_unary_op, // unary_op
-    complex_binary_op, // binary_op
-    NULL, // getiter
-    NULL, // iternext
-    .methods = { { NULL, NULL }, },
+    .print = complex_print,
+    .make_new = complex_make_new,
+    .unary_op = complex_unary_op,
+    .binary_op = complex_binary_op,
 };
 
 mp_obj_t mp_obj_new_complex(mp_float_t real, mp_float_t imag) {
-- 
cgit v1.2.3