From 5fa13625a1ca0ea1a3a1c5bb86d0880dcfac349f Mon Sep 17 00:00:00 2001 From: Dylan Conway <35280289+dylan-conway@users.noreply.github.com> Date: Wed, 21 Jun 2023 23:38:18 -0700 Subject: upgrade zig to `v0.11.0-dev.3737+9eb008717` (#3374) * progress * finish `@memset/@memcpy` update * Update build.zig * change `@enumToInt` to `@intFromEnum` and friends * update zig versions * it was 1 * add link to issue * add `compileError` reminder * fix merge * format * upgrade to llvm 16 * Revert "upgrade to llvm 16" This reverts commit cc930ceb1c5b4db9614a7638596948f704544ab8. --------- Co-authored-by: Jarred Sumner Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com> --- src/hive_array.zig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/hive_array.zig') diff --git a/src/hive_array.zig b/src/hive_array.zig index a29fe6842..0213156fd 100644 --- a/src/hive_array.zig +++ b/src/hive_array.zig @@ -37,11 +37,11 @@ pub fn HiveArray(comptime T: type, comptime capacity: u16) type { pub fn indexOf(self: *const Self, value: *const T) ?u32 { const start = &self.buffer; const end = @ptrCast([*]const T, start) + capacity; - if (!(@ptrToInt(value) >= @ptrToInt(start) and @ptrToInt(value) < @ptrToInt(end))) + if (!(@intFromPtr(value) >= @intFromPtr(start) and @intFromPtr(value) < @intFromPtr(end))) return null; // aligned to the size of T - const index = (@ptrToInt(value) - @ptrToInt(start)) / @sizeOf(T); + const index = (@intFromPtr(value) - @intFromPtr(start)) / @sizeOf(T); assert(index < capacity); assert(&self.buffer[index] == value); return @intCast(u32, index); @@ -50,7 +50,7 @@ pub fn HiveArray(comptime T: type, comptime capacity: u16) type { pub fn in(self: *const Self, value: *const T) bool { const start = &self.buffer; const end = @ptrCast([*]const T, start) + capacity; - return (@ptrToInt(value) >= @ptrToInt(start) and @ptrToInt(value) < @ptrToInt(end)); + return (@intFromPtr(value) >= @intFromPtr(start) and @intFromPtr(value) < @intFromPtr(end)); } pub fn put(self: *Self, value: *T) bool { -- cgit v1.2.3