diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2017-12-06 18:20:02 -0500 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2017-12-06 18:20:02 -0500 |
| commit | 7c91a055c120f9fdad122aad294a40a37510a6a6 (patch) | |
| tree | 60fd7fedf3b6553273f781eeb89c63f3068dec19 /std/debug.zig | |
| parent | 04612d25d7d33e8c3f08301d668ab94fe7479c84 (diff) | |
| parent | 62c25af8021fc399c9a8c667dd986a458b40a7dd (diff) | |
| download | zig-7c91a055c120f9fdad122aad294a40a37510a6a6.tar.gz zig-7c91a055c120f9fdad122aad294a40a37510a6a6.zip | |
Merge branch 'master' into self-hosted
Diffstat (limited to 'std/debug.zig')
| -rw-r--r-- | std/debug.zig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/std/debug.zig b/std/debug.zig index a2bea9eddd..c520e98b15 100644 --- a/std/debug.zig +++ b/std/debug.zig @@ -977,7 +977,7 @@ var some_mem_index: usize = 0; error OutOfMemory; -fn globalAlloc(self: &mem.Allocator, n: usize, alignment: usize) -> %[]u8 { +fn globalAlloc(self: &mem.Allocator, n: usize, alignment: u29) -> %[]u8 { const addr = @ptrToInt(&some_mem[some_mem_index]); const rem = @rem(addr, alignment); const march_forward_bytes = if (rem == 0) 0 else (alignment - rem); @@ -991,7 +991,7 @@ fn globalAlloc(self: &mem.Allocator, n: usize, alignment: usize) -> %[]u8 { return result; } -fn globalRealloc(self: &mem.Allocator, old_mem: []u8, new_size: usize, alignment: usize) -> %[]u8 { +fn globalRealloc(self: &mem.Allocator, old_mem: []u8, new_size: usize, alignment: u29) -> %[]u8 { if (new_size <= old_mem.len) { return old_mem[0..new_size]; } else { |