aboutsummaryrefslogtreecommitdiff
path: root/std/debug
diff options
context:
space:
mode:
authorAndrew Kelley <superjoe30@gmail.com>2018-02-12 10:48:02 -0500
committerAndrew Kelley <superjoe30@gmail.com>2018-02-12 10:48:02 -0500
commit491d818f17aa94b94998da51ebce6d153491744b (patch)
tree0bffe308c399b4ec9a4bae95349fea47f8387f94 /std/debug
parentef6260b3a7ed09e5dc5d8383ad20f229411bd9ff (diff)
parentec0846a00fd3d0ae0b7b94961f855b8ab6c938db (diff)
downloadzig-491d818f17aa94b94998da51ebce6d153491744b.tar.gz
zig-491d818f17aa94b94998da51ebce6d153491744b.zip
Merge remote-tracking branch 'origin/master' into llvm6
Diffstat (limited to 'std/debug')
-rw-r--r--std/debug/index.zig2
1 files changed, 1 insertions, 1 deletions
diff --git a/std/debug/index.zig b/std/debug/index.zig
index 5426a197f2..df1a1c5041 100644
--- a/std/debug/index.zig
+++ b/std/debug/index.zig
@@ -1078,5 +1078,5 @@ fn readILeb128(in_stream: var) !i64 {
}
pub const global_allocator = &global_fixed_allocator.allocator;
-var global_fixed_allocator = mem.FixedBufferAllocator.init(global_allocator_mem[0..]);
+var global_fixed_allocator = std.heap.FixedBufferAllocator.init(global_allocator_mem[0..]);
var global_allocator_mem: [100 * 1024]u8 = undefined;