bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Move over to calling ptr::addr_of

Browse source 
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.
This commit is contained in:
Tim Chevalier 2012-10-01 12:47:02 -07:00
parent 72ae42627b
commit b18320446e
54 changed files with 169 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libstd/net_ip.rs
View file

@ -89,11 +89,11 @@ fn get_addr(node: &str, iotask: iotask)
do str::as_buf(node) |node_ptr, len| unsafe {
log(debug, fmt!("slice len %?", len));
let handle = create_uv_getaddrinfo_t();
let handle_ptr = ptr::addr_of(handle);
let handle_ptr = ptr::addr_of(&handle);
let handle_data: GetAddrData = {
output_ch: output_ch
};
let handle_data_ptr = ptr::addr_of(handle_data);
let handle_data_ptr = ptr::addr_of(&handle_data);
do interact(iotask) |loop_ptr| unsafe {
let result = uv_getaddrinfo(
loop_ptr,
@ -150,7 +150,7 @@ mod v4 {
impl Ipv4Rep: AsUnsafeU32 {
// this is pretty dastardly, i know
unsafe fn as_u32() -> u32 {
*((ptr::addr_of(self)) as *u32)
*((ptr::addr_of(&self)) as *u32)
}
}
fn parse_to_ipv4_rep(ip: &str) -> result::Result<Ipv4Rep, ~str> {