diff options
| author | Damien George | 2014-06-07 22:02:35 +0100 |
|---|---|---|
| committer | Damien George | 2014-06-07 22:02:35 +0100 |
| commit | d31a093f9c2bdc3c94917c928fb2cc8c26b39959 (patch) | |
| tree | 8d45798562c303ebfdf889e3babdfbb0b2abc210 /py/objtype.c | |
| parent | f0778a7ccbbdd1d7bf116a6939c7eb05173e1987 (diff) | |
| parent | 5473f743f37e12921f4acb11fa84fe0d2b9d0650 (diff) | |
Merge branch 'master' of github.com:micropython/micropython
Conflicts:
py/emitglue.c
Diffstat (limited to 'py/objtype.c')
| -rw-r--r-- | py/objtype.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/py/objtype.c b/py/objtype.c index dfe5eaa8f..0d6674c33 100644 --- a/py/objtype.c +++ b/py/objtype.c @@ -336,9 +336,9 @@ STATIC const qstr binary_op_method_name[] = { MP_BINARY_OP_INPLACE_FLOOR_DIVIDE, MP_BINARY_OP_INPLACE_TRUE_DIVIDE, MP_BINARY_OP_INPLACE_MODULO, - MP_BINARY_OP_INPLACE_POWER, - MP_BINARY_OP_LESS, - MP_BINARY_OP_MORE, + MP_BINARY_OP_INPLACE_POWER,*/ + [MP_BINARY_OP_LESS] = MP_QSTR___lt__, + /*MP_BINARY_OP_MORE, MP_BINARY_OP_EQUAL, MP_BINARY_OP_LESS_EQUAL, MP_BINARY_OP_MORE_EQUAL, |