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

meta: dereferencing a pointer-like object which converts to bool works in all cases (false implies empty meta_any)

Browse Source
This commit is contained in:
Michele Caini
2022-03-15 08:29:33 +01:00
parent ba4b5ef9f2
commit c89bf30e05
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -171,7 +171,14 @@ class meta_any {
*static_cast<meta_any *>(other) = any_cast<Type>(value);
} else if constexpr(!std::is_same_v<std::remove_const_t<typename std::pointer_traits<Type>::element_type>, void>) {
using in_place_type = decltype(adl_meta_pointer_like<Type>::dereference(any_cast<const Type &>(value)));
static_cast<meta_any *>(other)->emplace<in_place_type>(adl_meta_pointer_like<Type>::dereference(any_cast<const Type &>(value)));
if constexpr(std::is_constructible_v<bool, Type>) {
if(const auto &pointer_like = any_cast<const Type &>(value); pointer_like) {
static_cast<meta_any *>(other)->emplace<in_place_type>(adl_meta_pointer_like<Type>::dereference(pointer_like));
}
} else {
static_cast<meta_any *>(other)->emplace<in_place_type>(adl_meta_pointer_like<Type>::dereference(any_cast<const Type &>(value)));
}
}
}
break;

11
test/entt/meta/meta_pointer.cpp
View File

@@ -400,3 +400,14 @@ TEST(MetaPointerLike, DereferenceArray) {
ASSERT_FALSE(*array);
ASSERT_FALSE(*array_of_array);
}
TEST(MetaPointerLike, DereferenceVerifiableNullPointerLike) {
auto test = [](entt::meta_any any) {
ASSERT_TRUE(any);
ASSERT_FALSE(*any);
};
test(entt::meta_any{static_cast<int *>(nullptr)});
test(entt::meta_any{std::shared_ptr<int>{}});
test(entt::meta_any{std::unique_ptr<int>{}});
}