diff options
| author | bors <bors@rust-lang.org> | 2013-07-27 01:49:35 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-07-27 01:49:35 -0700 |
| commit | 15310ba7c2a930a26bf6104f336cf7220eec7dc7 (patch) | |
| tree | e85d3a47641c3a9f00364996647626f882501c1b /src/libstd/unstable | |
| parent | c5194740a78ec113cb6cbc937e7263e2548f62f6 (diff) | |
| parent | df67942dccc33379051e66f075615e579f3bdb49 (diff) | |
| download | rust-15310ba7c2a930a26bf6104f336cf7220eec7dc7.tar.gz rust-15310ba7c2a930a26bf6104f336cf7220eec7dc7.zip | |
auto merge of #8040 : luqmana/rust/rtn, r=brson
Implements various missing tcp & udp methods.. Also fixes handling ipv4-mapped/compatible ipv6 addresses and addresses the XXX on `status_to_maybe_uv_error`. r? @brson
Diffstat (limited to 'src/libstd/unstable')
| -rw-r--r-- | src/libstd/unstable/lang.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/unstable/lang.rs b/src/libstd/unstable/lang.rs index d96681ae803..7a5e1116c32 100644 --- a/src/libstd/unstable/lang.rs +++ b/src/libstd/unstable/lang.rs @@ -71,8 +71,8 @@ pub unsafe fn local_malloc(td: *c_char, size: uintptr_t) -> *c_char { let mut alloc = ::ptr::null(); do Local::borrow::<Task,()> |task| { rtdebug!("task pointer: %x, heap pointer: %x", - to_uint(task), - to_uint(&task.heap)); + ::borrow::to_uint(task), + ::borrow::to_uint(&task.heap)); alloc = task.heap.alloc(td as *c_void, size as uint) as *c_char; } return alloc; |