[pypy-commit] pypy reflex-support: merge

[cfbolz]

Author: Carl Friedrich Bolz <cfbolz at gmx.de>
Branch: reflex-support
Changeset: r45583:5a36ac4cbf9f
Date: 2011-07-13 18:17 +0200
http://bitbucket.org/pypy/pypy/changeset/5a36ac4cbf9f/

Log:	merge

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
@@ -359,7 +359,8 @@
         return rffi.cast(rffi.VOIDP, x)
 
     def convert_argument_libffi(self, space, w_obj, argchain):
-        argchain.arg_singlefloat(self._unwrap_object(space, w_obj))
+        # it's required to sent an rffi.DOUBLE not r_singlefloat
+        argchain.arg_singlefloat(space.float_w(w_obj))
 
     def from_memory(self, space, w_obj, offset):
         address = self._get_raw_address(space, w_obj, offset)