diff options
| author | Tim Chevalier <chevalier@alum.wellesley.edu> | 2013-02-05 10:33:28 -0800 |
|---|---|---|
| committer | Tim Chevalier <chevalier@alum.wellesley.edu> | 2013-02-05 10:33:28 -0800 |
| commit | 2dcb3ed745d04048941a8130f3603c5759b2b142 (patch) | |
| tree | b02ae43f09244c7f4549a9c4171516d0cc257997 /src/rt/rust_task.cpp | |
| parent | 6f0bede97c3468eaba8cf59702d04c7ede8f4b0a (diff) | |
| parent | 2f46b763da2c098913884f101b6d71d69af41b49 (diff) | |
| download | rust-2dcb3ed745d04048941a8130f3603c5759b2b142.tar.gz rust-2dcb3ed745d04048941a8130f3603c5759b2b142.zip | |
Merge
Diffstat (limited to 'src/rt/rust_task.cpp')
| -rw-r--r-- | src/rt/rust_task.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp index 435f563713e..a9246963ca4 100644 --- a/src/rt/rust_task.cpp +++ b/src/rt/rust_task.cpp @@ -21,7 +21,6 @@ #include "rust_task.h" #include "rust_env.h" -#include "rust_port.h" #include "rust_globals.h" #include "rust_crate_map.h" @@ -37,7 +36,6 @@ rust_task::rust_task(rust_sched_loop *sched_loop, rust_task_state state, kernel(sched_loop->kernel), name(name), list_index(-1), - rendezvous_ptr(0), boxed(sched_loop->kernel->env, &local_region), local_region(&sched_loop->local_region), unwinding(false), @@ -344,12 +342,6 @@ void rust_task::fail_sched_loop() { sched_loop->fail(); } -frame_glue_fns* -rust_task::get_frame_glue_fns(uintptr_t fp) { - fp -= sizeof(uintptr_t); - return *((frame_glue_fns**) fp); -} - void rust_task::assert_is_running() { scoped_lock with(lifecycle_lock); |
