Author: Armin Rigo <[email protected]>
Branch: marker
Changeset: r1165:61e5e75b84f9
Date: 2014-04-18 12:09 +0200
http://bitbucket.org/pypy/stmgc/changeset/61e5e75b84f9/

Log:    hg merge default

diff --git a/c7/demo/demo2.c b/c7/demo/demo2.c
--- a/c7/demo/demo2.c
+++ b/c7/demo/demo2.c
@@ -221,7 +221,7 @@
     }
 
     STM_POP_ROOT(stm_thread_local, global_chained_list);
-    assert(org == (char *)stm_thread_local.shadowstack);
+    OPT_ASSERT(org == (char *)stm_thread_local.shadowstack);
 
     unregister_thread_local();
     status = sem_post(&done); assert(status == 0);
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to