[pypy-commit] pypy reflex-support: merge

[cfbolz]

Author: Carl Friedrich Bolz <cfbolz at gmx.de>
Branch: reflex-support
Changeset: r45591:169b3d988430
Date: 2011-07-14 15:06 +0200
http://bitbucket.org/pypy/pypy/changeset/169b3d988430/

Log:	merge

diff --git a/pypy/module/cppyy/test/Makefile b/pypy/module/cppyy/test/Makefile
--- a/pypy/module/cppyy/test/Makefile
+++ b/pypy/module/cppyy/test/Makefile
@@ -10,6 +10,11 @@
   cppflags=-I$(ROOTSYS)/include -L$(ROOTSYS)/lib
 endif
 
+PLATFORM := $(shell uname -s)
+ifeq ($(PLATFORM),Darwin)
+  cppflags+=-dynamiclib -single_module -arch x86_64
+endif
+
 ifeq ($(shell $(genreflex) --help | grep -- --with-methptrgetter),)
   genreflexflags=
   cppflags2=-O3
@@ -18,6 +23,7 @@
   cppflags2=-Wno-pmf-conversions -O3
 endif
 
+
 example01Dict.so: example01.cxx example01.h example01.xml
 	$(genreflex) example01.h $(genreflexflags) --selection=example01.xml
 	g++ -o $@ example01_rflx.cpp example01.cxx -shared -lReflex $(cppflags) $(cppflags2)
@@ -40,4 +46,3 @@
 operatorsDict.so: operators.cxx operators.h
 	$(genreflex) operators.h
 	g++ -o $@ operators_rflx.cpp operators.cxx -shared -lReflex $(cppflags) $(cppflags2)
-
diff --git a/pypy/module/cppyy/test/test_zjit.py b/pypy/module/cppyy/test/test_zjit.py
--- a/pypy/module/cppyy/test/test_zjit.py
+++ b/pypy/module/cppyy/test/test_zjit.py
@@ -1,6 +1,7 @@
 from pypy.jit.metainterp.test.support import LLJitMixin
 from pypy.rlib.objectmodel import specialize
 from pypy.rlib import rarithmetic, jit
+from pypy.rpython.lltypesystem import rffi
 from pypy.interpreter.baseobjspace import InternalSpaceCache, W_Root
 
 from pypy.module.cppyy import interp_cppyy
@@ -57,6 +58,8 @@
             return FakeFloat(obj)
         if isinstance(obj, str):
             return FakeString(obj)
+        if isinstance(obj, rffi.r_int):
+            return FakeInt(int(obj))
         assert 0
 
     def float_w(self, w_obj):