ed/gencpp
1
0
Fork 0
mirror of https://github.com/Ed94/gencpp.git synced 2024-12-22 07:44:45 -08:00
Code Issues Packages Projects Releases Wiki Activity

fixes for array container based on testing in Unreal

Browse Source
This commit is contained in:
Edward R. Gonzalez 2024-12-14 08:50:28 -05:00
parent a7da5f2060
commit 683f13deab
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
base/dependencies/containers.hpp
View File

@ -149,7 +149,7 @@ usize array_grow_formula(ssize value) {
template<class Type> inline template<class Type> inline
bool array_append_array(Array<Type>* array, Array<Type> other) { bool array_append_array(Array<Type>* array, Array<Type> other) {
return array_append_items(array, (Type*)other, num(other)); return array_append_items(array, (Type*)other, array_num(other));
} }
template<class Type> inline template<class Type> inline
@ -179,13 +179,13 @@ bool array_append_items(Array<Type>* array, Type* items, usize item_num)
GEN_ASSERT(* array != nullptr); GEN_ASSERT(* array != nullptr);
GEN_ASSERT(items != nullptr); GEN_ASSERT(items != nullptr);
GEN_ASSERT(item_num > 0); GEN_ASSERT(item_num > 0);
ArrayHeader* header = array_get_header(array); ArrayHeader* header = array_get_header(* array);
if (header->Num + item_num > header->Capacity) if (header->Num + item_num > header->Capacity)
{ {
if ( ! grow(array, header->Capacity + item_num)) if ( ! array_grow(array, header->Capacity + item_num))
return false; return false;
header = array_get_header(array); header = array_get_header(* array);
} }
mem_copy((Type*)array + header->Num, items, item_num * sizeof(Type)); mem_copy((Type*)array + header->Num, items, item_num * sizeof(Type));