Skip to content

Commit c632710

Browse files
committed
Changes to engine code after finalized Array refactor,
1 parent 38fb519 commit c632710

File tree

59 files changed

+65
-68
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+65
-68
lines changed

source/code/core/collections/public/ice/container/hashmap.hxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#pragma once
55
#include <ice/container_types.hxx>
6-
#include <ice/container/array.hxx>
6+
#include <ice/array.hxx>
77
#include <ice/mem_initializers.hxx>
88

99
namespace ice

source/code/core/collections/public/ice/container/impl/hashmap_impl.inl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,7 @@ namespace ice
893893

894894
while (it._entry != nullptr)
895895
{
896-
ice::array::push_back(items, *it._value);
896+
items.push_back(*it._value);
897897
it = ice::multi_hashmap::find_next(map, it);
898898
}
899899
}

source/code/core/collections/public/ice/container/impl/queue_impl.inl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ namespace ice
336336
ice::u32 const wrapped_end_idx = missing_items - (end_idx - start_idx);
337337

338338
// Construct until we hit end of the queue buffer
339-
ice::mem_construct_n_at<Type>(
339+
ice::mem_default_construct_n_at<Type>(
340340
Memory{
341341
.location = queue._data + start_idx,
342342
.size = ice::size_of<Type> * (end_idx - start_idx),
@@ -345,7 +345,7 @@ namespace ice
345345
(end_idx - start_idx)
346346
);
347347
// Construct the rest wrapped around the buffer
348-
ice::mem_construct_n_at<Type>(
348+
ice::mem_default_construct_n_at<Type>(
349349
Memory{
350350
.location = queue._data,
351351
.size = ice::size_of<Type> * wrapped_end_idx,

source/code/core/collections/public/ice/shard_container.hxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#pragma once
55
#include <ice/shard.hxx>
6-
#include <ice/container/array.hxx>
6+
#include <ice/array.hxx>
77

88
namespace ice
99
{
@@ -149,7 +149,7 @@ namespace ice
149149

150150
inline void push_back(ice::ShardContainer& container, ice::Span<ice::Shard const> values) noexcept
151151
{
152-
ice::array::push_back(container._data, values);
152+
container._data.push_back(values);
153153
}
154154

155155
inline void remove_all_of(ice::ShardContainer& container, ice::ShardID value) noexcept

source/code/core/modules/private/module_register.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/// SPDX-License-Identifier: MIT
33

44
#include <ice/module_register.hxx>
5-
#include <ice/container/array.hxx>
5+
#include <ice/array.hxx>
66
#include <ice/container/hashmap.hxx>
77
#include <ice/heap_string.hxx>
88
#include <ice/os/windows.hxx>

source/code/core/modules/public/ice/module_query.hxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
/// SPDX-License-Identifier: MIT
33

44
#pragma once
5+
#include <ice/array.hxx>
56
#include <ice/stringid.hxx>
67
#include <ice/module_info.hxx>
78
#include <ice/module_concepts.hxx>
8-
#include <ice/container/array.hxx>
99

1010
namespace ice
1111
{

source/code/core/modules/public/ice/module_register.hxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <ice/string_types.hxx>
88
#include <ice/stringid.hxx>
99
#include <ice/container_types.hxx>
10-
#include <ice/container/array.hxx>
10+
#include <ice/array.hxx>
1111
#include <ice/module_negotiator.hxx>
1212
#include <ice/module_query.hxx>
1313
#include <ice/module.hxx>

source/code/core/tasks/private/task_thread_pool_impl.hxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#pragma once
55
#include <ice/task_thread_pool.hxx>
66
#include <ice/task_flags.hxx>
7-
#include <ice/container/array.hxx>
7+
#include <ice/array.hxx>
88
#include <ice/container/hashmap.hxx>
99
#include "task_native_thread.hxx"
1010

source/code/core/tasks/public/ice/task_container.hxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <ice/task.hxx>
66
#include <ice/shard.hxx>
77
#include <ice/span.hxx>
8-
#include <ice/container/array.hxx>
8+
#include <ice/array.hxx>
99

1010
namespace ice
1111
{

source/code/core/tasks/public/ice/task_scoped_container.hxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#pragma once
55
#include <ice/task_container.hxx>
6-
#include <ice/container/array.hxx>
6+
#include <ice/array.hxx>
77
#include <ice/sync_manual_events.hxx>
88

99
namespace ice

0 commit comments

Comments
 (0)