Author: Armin Rigo <[email protected]>
Branch: c7-more-segments
Changeset: r1044:898bd6b4224f
Date: 2014-03-16 12:33 +0100
http://bitbucket.org/pypy/stmgc/changeset/898bd6b4224f/
Log: hg merge default
diff --git a/c7/demo/demo_random.c b/c7/demo/demo_random.c
--- a/c7/demo/demo_random.c
+++ b/c7/demo/demo_random.c
@@ -385,7 +385,7 @@
for (i = 0; i < PREBUILT_ROOTS; i++) {
void* new_templ = malloc(sizeof(struct node_s));
memcpy(new_templ, &prebuilt_template, sizeof(struct node_s));
- prebuilt_roots[i] = stm_setup_prebuilt((objptr_t)new_templ);
+ prebuilt_roots[i] = stm_setup_prebuilt((objptr_t)(long)new_templ);
if (i % 2 == 0) {
int hash = i + 5;
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
