aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgingerBill <bill@gingerbill.org>2020-11-29 14:31:42 +0000
committergingerBill <bill@gingerbill.org>2020-11-29 14:31:42 +0000
commit085972bb2ccde65d148b7fdc07b7ea8329e46293 (patch)
treeebbe54cd786e31249a16aa5820b9e3aea92cf9f6
parent39bed567b34a4bd74f7dfa99dd1ddb4621f67190 (diff)
Minor clean up
-rw-r--r--core/runtime/dynamic_map_internal.odin10
1 files changed, 3 insertions, 7 deletions
diff --git a/core/runtime/dynamic_map_internal.odin b/core/runtime/dynamic_map_internal.odin
index 0c7146e25..59661668f 100644
--- a/core/runtime/dynamic_map_internal.odin
+++ b/core/runtime/dynamic_map_internal.odin
@@ -265,16 +265,13 @@ __dynamic_map_grow :: proc(using h: Map_Header, loc := #caller_location) {
__dynamic_map_rehash(h, new_count, loc);
}
-__dynamic_map_full :: inline proc(using h: Map_Header) -> bool {
+__dynamic_map_full :: inline proc "contextless" (using h: Map_Header) -> bool {
return int(0.75 * f64(len(m.hashes))) <= m.entries.cap;
}
-__dynamic_map_hash_equal :: proc(h: Map_Header, a, b: Map_Hash) -> bool {
+__dynamic_map_hash_equal :: proc "contextless" (h: Map_Header, a, b: Map_Hash) -> bool {
if a.hash == b.hash {
- if a.key_ptr == b.key_ptr {
- return true;
- }
return h.equal(a.key_ptr, b.key_ptr);
}
return false;
@@ -322,7 +319,7 @@ __dynamic_map_get_entry :: proc(using h: Map_Header, index: int) -> ^Map_Entry_H
return (^Map_Entry_Header)(uintptr(m.entries.data) + uintptr(index*entry_size));
}
-__dynamic_map_copy_entry :: proc(h: Map_Header, new, old: ^Map_Entry_Header) {
+__dynamic_map_copy_entry :: proc "contextless" (h: Map_Header, new, old: ^Map_Entry_Header) {
mem_copy(new, old, h.entry_size);
}
@@ -351,6 +348,5 @@ __dynamic_map_erase :: proc(using h: Map_Header, fr: Map_Find_Result) #no_bounds
}
}
- // TODO(bill): Is this correct behaviour?
m.entries.len -= 1;
}