motiejus/zig
1
Fork 0
Code Releases Activity

allocgate: renamed getAllocator function to allocator

Browse Source
This commit is contained in:
Lee Cannon
2021-10-29 02:08:41 +01:00
parent 75548b50ff
commit 1093b09a98
77 changed files with 202 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/update_clang_options.zig
View File

@@ -450,13 +450,8 @@ const cpu_targets = struct {
pub fn main() anyerror!void {
var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
defer arena.deinit();
<<<<<<< HEAD
const allocator = &arena.allocator;
=======
const allocator = arena.getAllocator();
>>>>>>> 11157e318 (allocgate: stage 1 and 2 building)
const allocator = arena.allocator();
const args = try std.process.argsAlloc(allocator);
if (args.len <= 1) {