diff --git a/array/dynamic_array.jai b/array/dynamic_array.jai index ca2e780..2dc223b 100644 --- a/array/dynamic_array.jai +++ b/array/dynamic_array.jai @@ -20,9 +20,9 @@ append :: inline (arr: *[..]$T) -> *T { return basic.array_add(arr,, allocator = arr.allocator); } -resize :: inline (arr: *[..]$T, new_size: int) { - if new_size <= arr.allocated return; - basic.array_reserve(arr, new_size,, allocator = arr.allocator); +resize :: inline (arr: *[..]$T, new_count: int) { + if new_count <= arr.allocated return; + basic.array_reserve(arr, new_count,, allocator = arr.allocator); } remove_ordered :: inline (arr: *[..]$T, index: int, loc := #caller_location) #no_abc { diff --git a/memory/module.jai b/memory/module.jai index 576f955..6808174 100644 --- a/memory/module.jai +++ b/memory/module.jai @@ -67,9 +67,9 @@ init_or_zero :: inline (ptr: *$T, custom_init: (*T) = null) { custom_init(ptr); } - init :: initializer_of(T); - if init != null { - inline init(ptr); + initializer :: initializer_of(T); + #if initializer { + inline initializer(ptr); } else { memset(ptr, 0, size_of(T));