From 0e54ec12baf25f31edad1f502b465da66260e149 Mon Sep 17 00:00:00 2001 From: folling Date: Mon, 12 Feb 2024 15:49:26 +0100 Subject: [PATCH] fixup name-duplication checking Signed-off-by: Folling --- src/ikarus/objects/blueprint.cpp | 2 +- src/ikarus/objects/entity.cpp | 2 +- src/ikarus/objects/util.hpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ikarus/objects/blueprint.cpp b/src/ikarus/objects/blueprint.cpp index aa5f35c..77ffb70 100644 --- a/src/ikarus/objects/blueprint.cpp +++ b/src/ikarus/objects/blueprint.cpp @@ -17,7 +17,7 @@ IkarusBlueprint::IkarusBlueprint(IkarusProject * project, IkarusId id): IkarusBlueprint * ikarus_blueprint_create(struct IkarusProject * project, char const * name, IkarusErrorData * error_out) { IKARUS_FAIL_IF_NULL(project, nullptr); - IKARUS_FAIL_IF_NAME_INVALID_OR_DUPLICATE(name, project, nullptr, nullptr); + IKARUS_FAIL_IF_NAME_INVALID_OR_DUPLICATE(name, project, static_cast(nullptr), nullptr); IKARUS_VTRYRV_OR_FAIL( IkarusId const id, diff --git a/src/ikarus/objects/entity.cpp b/src/ikarus/objects/entity.cpp index d724259..bd5aa25 100644 --- a/src/ikarus/objects/entity.cpp +++ b/src/ikarus/objects/entity.cpp @@ -13,7 +13,7 @@ IkarusEntity * ikarus_entity_create(struct IkarusProject * project, char const * name, IkarusErrorData * error_out) { IKARUS_FAIL_IF_NULL(project, nullptr); - IKARUS_FAIL_IF_NAME_INVALID_OR_DUPLICATE(name, project, nullptr, nullptr); + IKARUS_FAIL_IF_NAME_INVALID_OR_DUPLICATE(name, project, static_cast(nullptr), nullptr); IKARUS_VTRYRV_OR_FAIL( IkarusId const id, diff --git a/src/ikarus/objects/util.hpp b/src/ikarus/objects/util.hpp index 4b55caa..1de035a 100644 --- a/src/ikarus/objects/util.hpp +++ b/src/ikarus/objects/util.hpp @@ -97,7 +97,7 @@ name_is_unique(IkarusProject const * project, std::string_view name, IkarusPrope } [[nodiscard]] inline bool -name_is_unique(IkarusProject * project, std::string_view name, IkarusProperty const * property, IkarusErrorData * error_out) { +name_is_unique(IkarusProject const * project, std::string_view name, IkarusProperty const * property, IkarusErrorData * error_out) { std::unique_ptr scope{ikarus_property_get_scope(property, error_out)}; IKARUS_FAIL_IF_ERROR(false);