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_uv.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_uv.cpp')
| -rw-r--r-- | src/rt/rust_uv.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rt/rust_uv.cpp b/src/rt/rust_uv.cpp index af587746090..d759ed84ef3 100644 --- a/src/rt/rust_uv.cpp +++ b/src/rt/rust_uv.cpp @@ -20,13 +20,13 @@ struct handle_data { // helpers static void* current_kernel_malloc(size_t size, const char* tag) { - void* ptr = rust_task_thread::get_task()->kernel->malloc(size, tag); + void* ptr = rust_sched_loop::get_task()->kernel->malloc(size, tag); return ptr; } static void current_kernel_free(void* ptr) { - rust_task_thread::get_task()->kernel->free(ptr); + rust_sched_loop::get_task()->kernel->free(ptr); } static handle_data* |