diff options
| author | Brian Anderson <banderson@mozilla.com> | 2013-04-29 18:28:01 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2013-04-30 17:01:27 -0700 |
| commit | 4a4646fd54a85f78512e5f2d1d2cd253954d1ea4 (patch) | |
| tree | 11e6e1bd26bf1cbdd278f30978fb632b0c74d7f7 /src/rt/rust_task.cpp | |
| parent | f1ddb8d5cc66941763039d3f727465b7cc34a100 (diff) | |
| parent | 6818e241b49c03c0fe0994dbe8340e2d8f482f09 (diff) | |
| download | rust-4a4646fd54a85f78512e5f2d1d2cd253954d1ea4.tar.gz rust-4a4646fd54a85f78512e5f2d1d2cd253954d1ea4.zip | |
Merge remote-tracking branch 'brson/io'
Conflicts: src/libcore/task/local_data_priv.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 e6293aa5c1d..7e3c91f6211 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), |