Author: Armin Rigo <[email protected]>
Branch: stm-thread-2
Changeset: r61476:1ed1bcec48fd
Date: 2013-02-19 17:45 +0100
http://bitbucket.org/pypy/pypy/changeset/1ed1bcec48fd/

Log:    merge heads

diff --git a/rpython/translator/stm/src_stm/rpyintf.c 
b/rpython/translator/stm/src_stm/rpyintf.c
--- a/rpython/translator/stm/src_stm/rpyintf.c
+++ b/rpython/translator/stm/src_stm/rpyintf.c
@@ -94,7 +94,7 @@
        d->count_reads is
        greater than reads_size_limit == reads_size_limit_nonatomic.
   */
-#ifdef RPY_STM_ASSERT
+#if 0   /* ifdef RPY_STM_ASSERT */
   /* reads_size_limit is ULONG_MAX if d->atomic, or else it is equal to
      reads_size_limit_nonatomic. */
   assert(d->reads_size_limit == (d->atomic ? ULONG_MAX :
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to