Scarfski/entt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meta: use the right return type for meta assoc container ::erase function

Browse Source
This commit is contained in:
Michele Caini
2023-08-21 11:30:37 +02:00
parent e942348211
commit d76fa92be3
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/entt/meta/container.hpp
View File

@@ -192,7 +192,7 @@ class basic_meta_associative_container_traits {
}
}
[[nodiscard]] static bool erase(void *container, const void *key) {
[[nodiscard]] static size_type erase(void *container, const void *key) {
return static_cast<Type *>(container)->erase(*static_cast<const typename Type::key_type *>(key));
}

8
src/entt/meta/meta.hpp
View File

@@ -163,7 +163,7 @@ private:
void (*begin_fn)(const void *, const bool, iterator &);
void (*end_fn)(const void *, const bool, iterator &);
bool (*insert_fn)(void *, const void *, const void *);
bool (*erase_fn)(void *, const void *);
size_type (*erase_fn)(void *, const void *);
void (*find_fn)(const void *, const bool, const void *, iterator &);
any storage{};
};
@@ -1953,8 +1953,8 @@ inline bool meta_associative_container::reserve(const size_type sz) {
* @return A bool denoting whether the insertion took place.
*/
inline bool meta_associative_container::insert(meta_any key, meta_any value = {}) {
const bool valid_key_value = key.allow_cast(meta_type{*ctx, key_type_node(internal::meta_context::from(*ctx))}) && (!mapped_type_node || value.allow_cast(meta_type{*ctx, mapped_type_node(internal::meta_context::from(*ctx))}));
return valid_key_value && (storage.policy() != any_policy::cref) && insert_fn(storage.data(), std::as_const(key).data(), std::as_const(value).data());
const bool valid_key = key.allow_cast(meta_type{*ctx, key_type_node(internal::meta_context::from(*ctx))}) && (!mapped_type_node || value.allow_cast(meta_type{*ctx, mapped_type_node(internal::meta_context::from(*ctx))}));
return valid_key && (storage.policy() != any_policy::cref) && insert_fn(storage.data(), std::as_const(key).data(), std::as_const(value).data());
}
/**
@@ -1964,7 +1964,7 @@ inline bool meta_associative_container::insert(meta_any key, meta_any value = {}
*/
inline meta_associative_container::size_type meta_associative_container::erase(meta_any key) {
const bool valid_key = key.allow_cast(meta_type{*ctx, key_type_node(internal::meta_context::from(*ctx))});
return valid_key && (storage.policy() != any_policy::cref) && erase_fn(storage.data(), std::as_const(key).data());
return (valid_key && (storage.policy() != any_policy::cref)) ? erase_fn(storage.data(), std::as_const(key).data()) : 0u;
}
/**