mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-01-14 08:45:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into windows-llvm-13.0.0

Browse Source
This commit is contained in:
gingerBill
2022-11-29 12:34:24 +00:00
parent e0c48277cd e59e34d334
commit 6c7bdaffea
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/runtime/dynamic_map_internal.odin
View File

@@ -512,8 +512,9 @@ map_reserve_dynamic :: proc "odin" (#no_alias m: ^Raw_Map, #no_alias info: ^Map_
}
}
map_free_dynamic(m^, info, loc) or_return
m.data = resized.data
return map_free_dynamic(m^, info, loc)
return nil
}
@@ -558,8 +559,9 @@ map_shrink_dynamic :: proc "odin" (#no_alias m: ^Raw_Map, #no_alias info: ^Map_I
}
}
map_free_dynamic(m^, info, loc) or_return
m.data = shrunk.data
return map_free_dynamic(m^, info, loc)
return nil
}
@(require_results)
@@ -567,8 +569,9 @@ map_free_dynamic :: proc "odin" (m: Raw_Map, info: ^Map_Info, loc := #caller_loc
ptr := rawptr(map_data(m))
size := int(map_total_allocation_size(uintptr(map_cap(m)), info))
err := mem_free_with_size(ptr, size, m.allocator, loc)
if err == .Mode_Not_Implemented {
err = nil
#partial switch err {
case .None, .Mode_Not_Implemented:
return nil
}
return err
}