Author: Armin Rigo <[email protected]>
Branch: stm-thread-2
Changeset: r62877:6a33a670a08a
Date: 2013-03-29 16:57 +0100
http://bitbucket.org/pypy/pypy/changeset/6a33a670a08a/
Log: Minor clean-ups
diff --git a/lib_pypy/transaction.py b/lib_pypy/transaction.py
--- a/lib_pypy/transaction.py
+++ b/lib_pypy/transaction.py
@@ -257,7 +257,7 @@
header = info[0]
f = cStringIO.StringIO()
if len(info) > 1:
- print >> f, 'Traceback from detected conflict:'
+ print >> f, 'Detected conflict:'
for tb in info[1:]:
filename = tb[0]
coname = tb[1]
diff --git a/rpython/translator/stm/src_stm/et.h
b/rpython/translator/stm/src_stm/et.h
--- a/rpython/translator/stm/src_stm/et.h
+++ b/rpython/translator/stm/src_stm/et.h
@@ -93,7 +93,6 @@
//gcptr Allocate(size_t size, int gctid);
_Bool stm_PtrEq(gcptr P1, gcptr P2);
-gcptr stm_HashObject(gcptr P);
void *stm_DirectReadBarrier(void *);
void *stm_DirectReadBarrierFromR(void *, void *, size_t);
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
