Author: Alexander Hesse <[email protected]>
Branch: split-rpython
Changeset: r60075:9960bb86e2a6
Date: 2013-01-15 02:51 +0100
http://bitbucket.org/pypy/pypy/changeset/9960bb86e2a6/
Log: missed conflict
diff --git a/rpython/jit/metainterp/test/test_warmspot.py
b/rpython/jit/metainterp/test/test_warmspot.py
--- a/rpython/jit/metainterp/test/test_warmspot.py
+++ b/rpython/jit/metainterp/test/test_warmspot.py
@@ -537,23 +537,7 @@
def test_callback_jit_merge_point(self):
-<<<<<<< local
- from rpython.rlib.objectmodel import register_around_callback_hook
- from rpython.rtyper.lltypesystem import lltype, rffi
- from rpython.translator.tool.cbuild import ExternalCompilationInfo
-
- callback_jit_driver = JitDriver(greens = ['name'], reds = 'auto')
-
- def callback_merge_point(name):
- callback_jit_driver.jit_merge_point(name=name)
-
- @callback_jit_driver.inline(callback_merge_point)
- def callback_hook(name):
- pass
-
-=======
@jit_callback("testing")
->>>>>>> other
def callback(a, b):
if a > b:
return 1
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
