diff options
Diffstat (limited to 'core/runtime')
| -rw-r--r-- | core/runtime/core.odin | 2 | ||||
| -rw-r--r-- | core/runtime/dynamic_map_internal.odin | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/runtime/core.odin b/core/runtime/core.odin index 69e5128a9..108609f78 100644 --- a/core/runtime/core.odin +++ b/core/runtime/core.odin @@ -416,7 +416,7 @@ Raw_Map :: struct { // Map_Hash directly, though for consistency sake it's written as if it were // an array of Map_Cell(Map_Hash). data: uintptr, // 8-bytes on 64-bits, 4-bytes on 32-bits - len: uintptr, // 8-bytes on 64-bits, 4-bytes on 32-bits + len: int, // 8-bytes on 64-bits, 4-bytes on 32-bits allocator: Allocator, // 16-bytes on 64-bits, 8-bytes on 32-bits } diff --git a/core/runtime/dynamic_map_internal.odin b/core/runtime/dynamic_map_internal.odin index 983bfde35..4218912c9 100644 --- a/core/runtime/dynamic_map_internal.odin +++ b/core/runtime/dynamic_map_internal.odin @@ -139,7 +139,7 @@ map_cell_index_dynamic_const :: proc "contextless" (base: uintptr, #no_alias inf // len() for map map_len :: #force_inline proc "contextless" (m: Raw_Map) -> int { - return int(m.len) + return m.len } // cap() for map @@ -591,7 +591,7 @@ map_shrink_dynamic :: proc(#no_alias m: ^Raw_Map, #no_alias info: ^Map_Info) -> // one minus the current log2 capacity's resize threshold. That is the shrunk // map needs to be within the max load factor. log2_capacity := map_log2_cap(m^) - if m.len >= map_load_factor(log2_capacity - 1) { + if uintptr(m.len) >= map_load_factor(log2_capacity - 1) { return nil } |