diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-04-01 00:13:59 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-04-01 00:15:04 -0700 |
| commit | e78396850d8e27138dd06e723de5ad3de0e65950 (patch) | |
| tree | 3768b6007a00186902b099efe24bf5ee82195cb3 /src/rt/rust_shape.cpp | |
| parent | 21064637ed8b8259d1305f21ace12c40b9561706 (diff) | |
| parent | de47fcfdf9404d53940099f5e7810bdb2bf37af3 (diff) | |
| download | rust-e78396850d8e27138dd06e723de5ad3de0e65950.tar.gz rust-e78396850d8e27138dd06e723de5ad3de0e65950.zip | |
Merge remote-tracking branch 'brson/mainthread'
Conflicts: src/rt/rust_sched_loop.cpp src/rt/rust_shape.cpp src/rt/rust_task.cpp
Diffstat (limited to 'src/rt/rust_shape.cpp')
| -rw-r--r-- | src/rt/rust_shape.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rt/rust_shape.cpp b/src/rt/rust_shape.cpp index c361dd4d441..acf44836f28 100644 --- a/src/rt/rust_shape.cpp +++ b/src/rt/rust_shape.cpp @@ -552,7 +552,7 @@ extern "C" void shape_cmp_type(int8_t *result, const type_desc *tydesc, const type_desc **subtydescs, uint8_t *data_0, uint8_t *data_1, uint8_t cmp_type) { - rust_task *task = rust_task_thread::get_task(); + rust_task *task = rust_sched_loop::get_task(); shape::arena arena; // FIXME: This may well be broken when comparing two closures or objects @@ -573,7 +573,7 @@ shape_cmp_type(int8_t *result, const type_desc *tydesc, extern "C" rust_str * shape_log_str(const type_desc *tydesc, uint8_t *data) { - rust_task *task = rust_task_thread::get_task(); + rust_task *task = rust_sched_loop::get_task(); shape::arena arena; shape::type_param *params = @@ -591,7 +591,7 @@ shape_log_str(const type_desc *tydesc, uint8_t *data) { extern "C" void shape_log_type(const type_desc *tydesc, uint8_t *data, uint32_t level) { - rust_task *task = rust_task_thread::get_task(); + rust_task *task = rust_sched_loop::get_task(); shape::arena arena; shape::type_param *params = @@ -603,6 +603,6 @@ shape_log_type(const type_desc *tydesc, uint8_t *data, uint32_t level) { log.walk(); - task->thread->log(task, level, "%s", ss.str().c_str()); + task->sched_loop->log(task, level, "%s", ss.str().c_str()); } |