diff options
| author | Brian Anderson <banderson@mozilla.com> | 2013-04-24 18:53:09 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2013-04-24 19:06:05 -0700 |
| commit | 28ab152832450a69d36c027f3a7177faf8811f7c (patch) | |
| tree | 544f9fda26460f362537c54336ec85f1c89959b9 /src/rt/rust_task.cpp | |
| parent | 0c6f9a889b7807ce5d793c3005d2ef8d150dd838 (diff) | |
| parent | 436657b5f04a6d7504cfc00224c26910569c67eb (diff) | |
| download | rust-28ab152832450a69d36c027f3a7177faf8811f7c.tar.gz rust-28ab152832450a69d36c027f3a7177faf8811f7c.zip | |
Merge remote-tracking branch 'brson/io'
Conflicts: src/libcore/rt/uvio.rs
Diffstat (limited to 'src/rt/rust_task.cpp')
| -rw-r--r-- | src/rt/rust_task.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp index 7e146cce68e..268e0f63de6 100644 --- a/src/rt/rust_task.cpp +++ b/src/rt/rust_task.cpp @@ -36,7 +36,7 @@ rust_task::rust_task(rust_sched_loop *sched_loop, rust_task_state state, kernel(sched_loop->kernel), name(name), list_index(-1), - boxed(sched_loop->kernel->env, &local_region), + boxed(&local_region, sched_loop->kernel->env->poison_on_free), local_region(&sched_loop->local_region), unwinding(false), total_stack_sz(0), |