diff options
| author | scurest <scurest@users.noreply.github.com> | 2017-11-05 15:46:21 -0600 |
|---|---|---|
| committer | scurest <scurest@users.noreply.github.com> | 2017-11-05 15:46:54 -0600 |
| commit | 48c8181886e783aecb32c2c9ca9e2af1e39fd1bf (patch) | |
| tree | 72665f75f2b000ddd6434343643f1db1d1aa1173 | |
| parent | bd6f8d99c57004716333a3371fc6574fee534ecc (diff) | |
| download | zig-48c8181886e783aecb32c2c9ca9e2af1e39fd1bf.tar.gz zig-48c8181886e783aecb32c2c9ca9e2af1e39fd1bf.zip | |
fix redeclaration of mem (#585)
| -rw-r--r-- | std/heap.zig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/std/heap.zig b/std/heap.zig index 3f67a97926..d0bf8ab871 100644 --- a/std/heap.zig +++ b/std/heap.zig @@ -17,8 +17,8 @@ pub var c_allocator = Allocator { }; fn cAlloc(self: &Allocator, n: usize, alignment: usize) -> %[]u8 { - if (c.malloc(usize(n))) |mem| { - @ptrCast(&u8, mem)[0..n] + if (c.malloc(usize(n))) |buf| { + @ptrCast(&u8, buf)[0..n] } else { error.OutOfMemory } @@ -29,8 +29,8 @@ fn cRealloc(self: &Allocator, old_mem: []u8, new_size: usize, alignment: usize) old_mem[0..new_size] } else { const old_ptr = @ptrCast(&c_void, old_mem.ptr); - if (c.realloc(old_ptr, usize(new_size))) |mem| { - @ptrCast(&u8, mem)[0..new_size] + if (c.realloc(old_ptr, usize(new_size))) |buf| { + @ptrCast(&u8, buf)[0..new_size] } else { error.OutOfMemory } |