Author: Wim Lavrijsen <[email protected]>
Branch: reflex-support
Changeset: r44357:b83af8a0ae66
Date: 2011-05-21 09:04 -0700
http://bitbucket.org/pypy/pypy/changeset/b83af8a0ae66/
Log: consisten use of void* and char*
diff --git a/pypy/module/cppyy/converter.py b/pypy/module/cppyy/converter.py
--- a/pypy/module/cppyy/converter.py
+++ b/pypy/module/cppyy/converter.py
@@ -20,7 +20,7 @@
cpp_instance = space.interp_w(W_CPPInstance, w_cpp_instance,
can_be_None=True)
if cpp_instance:
return cpp_instance.rawobject
- return lltype.nullptr(rffi.CCHARP.TO)
+ return lltype.nullptr(rffi.VOIDP.TO)
class TypeConverter(object):
@@ -34,7 +34,8 @@
def _get_raw_address(self, space, w_obj, offset):
rawobject = get_rawobject(space, w_obj)
if rawobject:
- fieldptr = lltype.direct_ptradd(rawobject, offset)
+ field_address = lltype.direct_ptradd(rawobject, offset)
+ fieldptr = rffi.cast(rffi.CCHARP, field_address)
else:
fieldptr = rffi.cast(rffi.CCHARP, offset)
return fieldptr
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
