Skip to content

Commit d5d31d5

Browse files
DandieloDandielo
committed
Fixes to Windows and non-unity builds.
1 parent dcda8a4 commit d5d31d5

File tree

13 files changed

+56
-47
lines changed

13 files changed

+56
-47
lines changed

‎source/code/core/collections/public/ice/heap_string.hxx‎

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

44
#pragma once
5+
#include <ice/string.hxx>
56
#include <ice/string/string_concepts.hxx>
67
#include <ice/string/resizable_operations.hxx>
7-
#include <ice/string.hxx>
88
#include <ice/mem_allocator.hxx>
99

1010
namespace ice

‎source/code/core/collections/public/ice/queue.hxx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include <ice/container/container_concepts.hxx>
66
#include <ice/container/basic_container.hxx>
77
#include <ice/container/resizable_container.hxx>
8+
#include <ice/mem_initializers.hxx>
89

910
namespace ice
1011
{

‎source/code/core/collections/tests/test_queue.cxx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
#include <ice/mem_allocator_host.hxx>
66
#include <ice/mem_allocator_proxy.hxx>
77
#include <ice/queue.hxx>
8+
#include <ice/span.hxx>
9+
810
#include "util_tracking_object.hxx"
911

1012
SCENARIO("collections 'ice/container/queue.hxx'", "[collection][queue][complex]")

‎source/code/core/core/public/ice/shard.hxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ namespace ice
356356
template<>
357357
constexpr inline ice::ShardPayloadID Constant_ShardPayloadID<ice::StringID_Hash> = ice::shard_payloadid("ice::StringID_Hash");
358358

359-
359+
template<>
360360
constexpr auto hash(ice::ShardID shardid) noexcept -> ice::u64
361361
{
362362
return ice::bit_cast<ice::u64>(shardid);

‎source/code/core/devui/public/ice/devui_imgui.hxx‎

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
#pragma once
5-
#include <ice/string.hxx>
5+
#include <ice/heap_string.hxx>
66
#include <ice/assert_core.hxx>
77
#include <ice/color.hxx>
88

‎source/code/core/tasks/private/task_thread_pool_impl.cxx‎

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

44
#include "task_thread_pool_impl.hxx"
5+
#include <ice/static_string.hxx>
56
#include <ice/string.hxx>
67
#include <ice/assert.hxx>
78

‎source/code/core/utils/private/config/config_builder.hxx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#pragma once
55
#include "config_builder_types.hxx"
66
#include "config_builder_utils.hxx"
7+
#include <ice/hashmap.hxx>
78

89
namespace ice::config::detail
910
{

‎source/code/core/utils/public/ice/path_utils.hxx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -185,22 +185,22 @@ namespace ice
185185
} // namespace
186186

187187

188-
template<typename CharType>
189-
struct fmt::formatter<ice::BasicPath<CharType>> : public fmt::formatter<std::basic_string_view<CharType>>
188+
template<>
189+
struct fmt::formatter<ice::BasicPath<char>> : public fmt::formatter<std::basic_string_view<char>>
190190
{
191191
template<typename FormatContext>
192-
constexpr auto format(ice::BasicPath<CharType> value, FormatContext& ctx) const noexcept
192+
constexpr auto format(ice::BasicPath<char> value, FormatContext& ctx) const noexcept
193193
{
194-
return fmt::formatter<std::basic_string_view<CharType>>::format(value, ctx);
194+
return fmt::formatter<std::basic_string_view<char>>::format(value, ctx);
195195
}
196196
};
197197

198-
template<typename CharType>
199-
struct fmt::formatter<ice::BasicHeapPath<CharType>> : public fmt::formatter<ice::BasicPath<CharType>>
198+
template<>
199+
struct fmt::formatter<ice::BasicHeapPath<char>> : public fmt::formatter<ice::BasicPath<char>>
200200
{
201201
template<typename FormatContext>
202-
constexpr auto format(ice::BasicHeapPath<CharType> value, FormatContext& ctx) const noexcept
202+
constexpr auto format(ice::BasicHeapPath<char> value, FormatContext& ctx) const noexcept
203203
{
204-
return fmt::formatter<ice::BasicPath<CharType>>::format(value, ctx);
204+
return fmt::formatter<ice::BasicPath<char>>::format(value, ctx);
205205
}
206206
};

‎source/code/modules/imgui_module/private/widgets/imgui_logger.hxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33

44

55
#pragma once
6+
#include <ice/array.hxx>
7+
#include <ice/heap_string.hxx>
68
#include <ice/devui_widget.hxx>
79
#include <ice/devui_frame.hxx>
8-
#include <ice/array.hxx>
910
#include <ice/log_sink.hxx>
1011

1112
namespace ice::devui

‎source/code/systems/input_action_system/private/input_action.cxx‎

Lines changed: 25 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
namespace ice
1414
{
1515

16-
void asset_category_shader_definition(
16+
void asset_category_actions_definition(
1717
ice::AssetCategoryArchive& asset_category_archive,
1818
ice::ModuleQuery const& module_query
1919
) noexcept
@@ -25,44 +25,39 @@ namespace ice
2525
asset_category_archive.register_category(ice::AssetCategory_InputActionsScript, definition);
2626
}
2727

28-
struct InputActionsModule : public ice::Module<InputActionsModule>
29-
{
3028

3129
#if 0
32-
auto ias_compiler_supported_resources(
33-
ice::Span<ice::Shard const> params
34-
) noexcept -> ice::Span<ice::String const>
35-
{
36-
static ice::String ext[]{ ".ias" };
37-
return ext;
38-
}
30+
auto ias_compiler_supported_resources(
31+
ice::Span<ice::Shard const> params
32+
) noexcept -> ice::Span<ice::String const>
33+
{
34+
static ice::String ext[]{ ".ias" };
35+
return ext;
36+
}
3937

40-
static void v1_compiler_api(ice::api::resource_compiler::v1::ResourceCompilerAPI& api) noexcept
41-
{
42-
api.id_category = "ice/ias-script-resource"_sid;
43-
api.fn_supported_resources = ias_compiler_supported_resources;
44-
}
38+
static void v1_compiler_api(ice::api::resource_compiler::v1::ResourceCompilerAPI& api) noexcept
39+
{
40+
api.id_category = "ice/ias-script-resource"_sid;
41+
api.fn_supported_resources = ias_compiler_supported_resources;
42+
}
4543
#endif
4644

47-
static void v1_archive_api(ice::detail::asset_system::v1::AssetArchiveAPI& api) noexcept
48-
{
49-
api.fn_register_categories = asset_category_shader_definition;
50-
}
45+
void InputActionsModule::v1_archive_api(ice::detail::asset_system::v1::AssetArchiveAPI& api) noexcept
46+
{
47+
api.fn_register_categories = asset_category_actions_definition;
48+
}
5149

52-
static bool on_load(ice::Allocator& alloc, ice::ModuleNegotiator auto& negotiator) noexcept
50+
bool InputActionsModule::on_load(ice::Allocator& alloc, ice::ModuleNegotiator auto& negotiator) noexcept
51+
{
52+
// Since we are on the 'system' layer, we can be part of multiple dynamic libararies, and prefere to not be loaded from them.
53+
if (negotiator.from_app())
5354
{
54-
// Since we are on the 'system' layer, we can be part of multiple dynamic libararies, and prefere to not be loaded from them.
55-
if (negotiator.from_app())
56-
{
5755
#if 0 // Currently we don't really support compiling for InputAction scripts.
58-
negotiator.register_api(v1_compiler_api);
56+
negotiator.register_api(v1_compiler_api);
5957
#endif
60-
negotiator.register_api(v1_archive_api);
61-
}
62-
return true;
58+
negotiator.register_api(v1_archive_api);
6359
}
64-
65-
ICE_WORKAROUND_MODULE_INITIALIZATION(InputActionsModule);
66-
};
60+
return true;
61+
}
6762

6863
} // namespace ice

0 commit comments

Comments
 (0)