From 999cedb90ff0827cdb9dfe0e4faa6ebc1739d271 Mon Sep 17 00:00:00 2001
From: Damien George
Date: Fri, 27 Nov 2015 17:01:44 +0000
Subject: py: Wrap all obj-ptr conversions in MP_OBJ_TO_PTR/MP_OBJ_FROM_PTR.

This allows the mp_obj_t type to be configured to something other than a
pointer-sized primitive type.

This patch also includes additional changes to allow the code to compile
when sizeof(mp_uint_t) != sizeof(void*), such as using size_t instead of
mp_uint_t, and various casts.
---
 py/objfilter.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'py/objfilter.c')

diff --git a/py/objfilter.c b/py/objfilter.c
index 9ed37f598..cc3083c96 100644
--- a/py/objfilter.c
+++ b/py/objfilter.c
@@ -37,15 +37,15 @@ typedef struct _mp_obj_filter_t {
 STATIC mp_obj_t filter_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 2, 2, false);
     mp_obj_filter_t *o = m_new_obj(mp_obj_filter_t);
-    o->base.type = type_in;
+    o->base.type = MP_OBJ_TO_PTR(type_in);
     o->fun = args[0];
     o->iter = mp_getiter(args[1]);
-    return o;
+    return MP_OBJ_FROM_PTR(o);
 }
 
 STATIC mp_obj_t filter_iternext(mp_obj_t self_in) {
     assert(MP_OBJ_IS_TYPE(self_in, &mp_type_filter));
-    mp_obj_filter_t *self = self_in;
+    mp_obj_filter_t *self = MP_OBJ_TO_PTR(self_in);
     mp_obj_t next;
     while ((next = mp_iternext(self->iter)) != MP_OBJ_STOP_ITERATION) {
         mp_obj_t val;
-- 
cgit v1.2.3