From a8c4f4674714e88f1d81192835f095ff0d282f45 Mon Sep 17 00:00:00 2001 From: Laytan Laats Date: Wed, 7 Feb 2024 19:51:00 +0100 Subject: [PATCH 1/2] fix ci --- src/build_settings.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/build_settings.cpp b/src/build_settings.cpp index 9a773f9d3..0bcb9f298 100644 --- a/src/build_settings.cpp +++ b/src/build_settings.cpp @@ -907,7 +907,7 @@ gb_internal String internal_odin_root_dir(void) { text = gb_alloc_array(permanent_allocator(), u8, len + 1); gb_memmove(text, &path_buf[0], len); - path = path_to_fullpath(heap_allocator(), make_string(text, len)); + path = path_to_fullpath(heap_allocator(), make_string(text, len), nullptr); for (i = path.len-1; i >= 0; i--) { u8 c = path[i]; @@ -1072,7 +1072,7 @@ gb_internal String internal_odin_root_dir(void) { gb_memmove(text, &path_buf[0], len); - path = path_to_fullpath(heap_allocator(), make_string(text, len)); + path = path_to_fullpath(heap_allocator(), make_string(text, len), nullptr); for (i = path.len-1; i >= 0; i--) { u8 c = path[i]; if (c == '/' || c == '\\') { @@ -1126,7 +1126,7 @@ gb_internal String path_to_fullpath(gbAllocator a, String s, bool *ok_) { return result; } #elif defined(GB_SYSTEM_OSX) || defined(GB_SYSTEM_UNIX) -gb_internal String path_to_fullpath(gbAllocator a, String s) { +gb_internal String path_to_fullpath(gbAllocator a, String s, bool *ok_) { char *p; mutex_lock(&fullpath_mutex); p = realpath(cast(char *)s.text, 0); From 9d0786ded7ce91c9b432229aaea5c35aae1155eb Mon Sep 17 00:00:00 2001 From: Zac Nowicki Date: Thu, 8 Feb 2024 04:14:16 -0500 Subject: [PATCH 2/2] Remove invalid allocator assignment to slice `T` is `#soa[]$E`, which does not carry an allocator. --- base/runtime/core_builtin_soa.odin | 1 - 1 file changed, 1 deletion(-) diff --git a/base/runtime/core_builtin_soa.odin b/base/runtime/core_builtin_soa.odin index 1b2e5d316..94f5be1d4 100644 --- a/base/runtime/core_builtin_soa.odin +++ b/base/runtime/core_builtin_soa.odin @@ -86,7 +86,6 @@ make_soa_aligned :: proc($T: typeid/#soa[]$E, length: int, alignment: int, alloc return } - array.allocator = allocator footer := raw_soa_footer(&array) if size_of(E) == 0 { footer.len = length