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

meta: minor changes for consistency

Browse Source
This commit is contained in:
Michele Caini
2022-09-07 14:54:34 +02:00
parent ac6e9cf2f0
commit e31b81294d
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/entt/meta/factory.hpp
View File

@@ -492,8 +492,9 @@ public:
*/
template<typename Type>
[[nodiscard]] auto meta() noexcept {
auto res = internal::meta_context::from(locator<meta_ctx>::value_or()).value.try_emplace(type_id<Type>().hash(), internal::resolve<Type>());
// extended meta factory to allow assigning properties to opaque meta types
return meta_factory<Type, internal::meta_type_node>{internal::meta_context::from(locator<meta_ctx>::value_or()).value.try_emplace(type_id<Type>().hash(), internal::resolve<Type>()).first->second};
return meta_factory<Type, internal::meta_type_node>{res.first->second};
}
/**

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

@@ -64,11 +64,11 @@ public:
[[nodiscard]] inline explicit operator bool() const noexcept;
private:
internal::meta_type_node value_type_node = {};
size_type (*size_fn)(const any &) noexcept = nullptr;
bool (*resize_fn)(any &, size_type) = nullptr;
iterator (*iter_fn)(any &, const bool) = nullptr;
iterator (*insert_or_erase_fn)(any &, const any &, meta_any &) = nullptr;
internal::meta_type_node value_type_node{};
size_type (*size_fn)(const any &) noexcept {};
bool (*resize_fn)(any &, size_type){};
iterator (*iter_fn)(any &, const bool){};
iterator (*insert_or_erase_fn)(any &, const any &, meta_any &){};
any storage{};
};
@@ -122,14 +122,14 @@ public:
private:
bool key_only_container{};
internal::meta_type_node key_type_node = {};
internal::meta_type_node mapped_type_node = {};
internal::meta_type_node value_type_node = {};
size_type (*size_fn)(const any &) noexcept = nullptr;
bool (*clear_fn)(any &) = nullptr;
iterator (*iter_fn)(any &, const bool) = nullptr;
size_type (*insert_or_erase_fn)(any &, meta_any &, meta_any &) = nullptr;
iterator (*find_fn)(any &, meta_any &) = nullptr;
internal::meta_type_node key_type_node{};
internal::meta_type_node mapped_type_node{};
internal::meta_type_node value_type_node{};
size_type (*size_fn)(const any &) noexcept {};
bool (*clear_fn)(any &){};
iterator (*iter_fn)(any &, const bool){};
size_type (*insert_or_erase_fn)(any &, meta_any &, meta_any &){};
iterator (*find_fn)(any &, meta_any &){};
any storage{};
};