diff options
| author | Tim Chevalier <chevalier@alum.wellesley.edu> | 2012-10-01 12:47:02 -0700 |
|---|---|---|
| committer | Tim Chevalier <chevalier@alum.wellesley.edu> | 2012-10-01 15:12:09 -0700 |
| commit | b18320446e553a3f8436f87306dded57e16a4b94 (patch) | |
| tree | abdcb49970d3dbf041decc79adc86db55d0c25b8 /src/libstd/timer.rs | |
| parent | 72ae42627b023a6f453316df7735fd9cb4e9283b (diff) | |
| download | rust-b18320446e553a3f8436f87306dded57e16a4b94.tar.gz rust-b18320446e553a3f8436f87306dded57e16a4b94.zip | |
Move over to calling ptr::addr_of
Everything should now call ptr::addr_of instead of ptr::p2::addr_of. Only the pipes macro code when compiled by stage0 will call ptr::p2::addr_of. Needs a snapshot to get rid of that.
Diffstat (limited to 'src/libstd/timer.rs')
| -rw-r--r-- | src/libstd/timer.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/timer.rs b/src/libstd/timer.rs index a2f9796f89e..8aaf7d3fd87 100644 --- a/src/libstd/timer.rs +++ b/src/libstd/timer.rs @@ -28,9 +28,9 @@ pub fn delayed_send<T: Copy Send>(iotask: IoTask, unsafe { let timer_done_po = core::comm::Port::<()>(); let timer_done_ch = core::comm::Chan(timer_done_po); - let timer_done_ch_ptr = ptr::addr_of(timer_done_ch); + let timer_done_ch_ptr = ptr::addr_of(&timer_done_ch); let timer = uv::ll::timer_t(); - let timer_ptr = ptr::addr_of(timer); + let timer_ptr = ptr::addr_of(&timer); do iotask::interact(iotask) |loop_ptr| unsafe { let init_result = uv::ll::timer_init(loop_ptr, timer_ptr); if (init_result == 0i32) { |