From beaa5bb0a589b695f11d0746fe8fd95169fb2fb4 Mon Sep 17 00:00:00 2001 From: Robin Voetter Date: Sat, 5 Jun 2021 13:42:30 +0200 Subject: [PATCH] Adapt to changed hashmap API --- generator/vulkan/generator.zig | 8 ++++---- generator/vulkan/render.zig | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/generator/vulkan/generator.zig b/generator/vulkan/generator.zig index 32e5179..ade9af0 100644 --- a/generator/vulkan/generator.zig +++ b/generator/vulkan/generator.zig @@ -29,8 +29,8 @@ const EnumFieldMerger = struct { } fn deinit(self: *EnumFieldMerger) void { - for (self.enum_extensions.items()) |*entry| { - entry.value.deinit(self.gpa); + for (self.enum_extensions.values()) |*value| { + value.deinit(self.gpa); } self.field_set.deinit(); @@ -40,10 +40,10 @@ const EnumFieldMerger = struct { fn putEnumExtension(self: *EnumFieldMerger, enum_name: []const u8, field: reg.Enum.Field) !void { const res = try self.enum_extensions.getOrPut(enum_name); if (!res.found_existing) { - res.entry.value = std.ArrayListUnmanaged(reg.Enum.Field){}; + res.value_ptr.* = std.ArrayListUnmanaged(reg.Enum.Field){}; } - try res.entry.value.append(self.gpa, field); + try res.value_ptr.append(self.gpa, field); } fn addRequires(self: *EnumFieldMerger, reqs: []const reg.Require) !void { diff --git a/generator/vulkan/render.zig b/generator/vulkan/render.zig index 4efa440..950a27a 100644 --- a/generator/vulkan/render.zig +++ b/generator/vulkan/render.zig @@ -195,7 +195,7 @@ fn Renderer(comptime WriterType: type) type { return error.InvalidRegistry; } - result.entry.value = &decl.decl_type; + result.value_ptr.* = &decl.decl_type; } return Self{