meta: removed meta_data::id

src/entt/meta/factory.hpp

@@ -197,7 +197,6 @@ class meta_factory<Type> {
         static_assert(Policy::template value<data_type>, "Invalid return type for the given policy");
 
         owner->data[id] = internal::meta_data_node{
-            id,
             /* this is never static */
             (std::is_member_object_pointer_v<decltype(value_list_element_v<Index, Setter>)> && ... && std::is_const_v<std::remove_reference_t<data_type>>) ? internal::meta_traits::is_const : internal::meta_traits::is_none,
             nullptr,
@@ -396,7 +395,6 @@ public:
             using data_type = std::remove_reference_t<std::invoke_result_t<decltype(Data), Type &>>;
 
             owner->data[id] = internal::meta_data_node{
-                id,
                 /* this is never static */
                 std::is_const_v<data_type> ? internal::meta_traits::is_const : internal::meta_traits::is_none,
                 nullptr,
@@ -411,7 +409,6 @@ public:
             using data_type = std::remove_reference_t<std::remove_pointer_t<decltype(Data)>>;
 
             owner->data[id] = internal::meta_data_node{
-                id,
                 ((std::is_same_v<Type, std::remove_const_t<data_type>> || std::is_const_v<data_type>) ? internal::meta_traits::is_const : internal::meta_traits::is_none) | internal::meta_traits::is_static,
                 nullptr,
                 1u,
@@ -451,7 +448,6 @@ public:
 
         if constexpr(std::is_same_v<decltype(Setter), std::nullptr_t>) {
             owner->data[id] = internal::meta_data_node{
-                id,
                 /* this is never static */
                 internal::meta_traits::is_const,
                 nullptr,
@@ -466,7 +462,6 @@ public:
             using args_type = typename meta_function_helper_t<Type, decltype(Setter)>::args_type;
 
             owner->data[id] = internal::meta_data_node{
-                id,
                 /* this is never static nor const */
                 internal::meta_traits::is_none,
                 nullptr,

src/entt/meta/meta.hpp

@@ -703,11 +703,6 @@ struct meta_data {
     meta_data(const node_type *curr = nullptr) noexcept
         : node{curr} {}
 
-    /*! @copydoc meta_type::id */
-    [[nodiscard]] id_type id() const noexcept {
-        return node->id;
-    }
-
     /**
      * @brief Returns the number of setters available.
      * @return The number of setters available.

src/entt/meta/node.hpp

@@ -75,7 +75,6 @@ struct meta_dtor_node {
 struct meta_data_node {
     using size_type = std::size_t;
 
-    id_type id;
     meta_traits traits;
     meta_prop_node *prop;
     size_type arity;

test/entt/meta/meta_data.cpp

@@ -169,7 +169,6 @@ TEST_F(MetaData, Functionalities) {
     ASSERT_EQ(data.arity(), 1u);
     ASSERT_EQ(data.type(), entt::resolve<int>());
     ASSERT_EQ(data.arg(0u), entt::resolve<int>());
-    ASSERT_EQ(data.id(), "i"_hs);
     ASSERT_FALSE(data.is_const());
     ASSERT_FALSE(data.is_static());
     ASSERT_EQ(data.get(instance).cast<int>(), 0);
@@ -201,7 +200,6 @@ TEST_F(MetaData, Const) {
     ASSERT_EQ(data.arity(), 1u);
     ASSERT_EQ(data.type(), entt::resolve<int>());
     ASSERT_EQ(data.arg(0u), entt::resolve<int>());
-    ASSERT_EQ(data.id(), "j"_hs);
     ASSERT_TRUE(data.is_const());
     ASSERT_FALSE(data.is_static());
     ASSERT_EQ(data.get(instance).cast<int>(), 1);
@@ -232,7 +230,6 @@ TEST_F(MetaData, Static) {
     ASSERT_EQ(data.arity(), 1u);
     ASSERT_EQ(data.type(), entt::resolve<int>());
     ASSERT_EQ(data.arg(0u), entt::resolve<int>());
-    ASSERT_EQ(data.id(), "h"_hs);
     ASSERT_FALSE(data.is_const());
     ASSERT_TRUE(data.is_static());
     ASSERT_EQ(data.get({}).cast<int>(), 2);
@@ -263,7 +260,6 @@ TEST_F(MetaData, ConstStatic) {
     ASSERT_EQ(data.arity(), 1u);
     ASSERT_EQ(data.type(), entt::resolve<int>());
     ASSERT_EQ(data.arg(0u), entt::resolve<int>());
-    ASSERT_EQ(data.id(), "k"_hs);
     ASSERT_TRUE(data.is_const());
     ASSERT_TRUE(data.is_static());
     ASSERT_EQ(data.get({}).cast<int>(), 3);
@@ -386,7 +382,6 @@ TEST_F(MetaData, SetterGetterAsFreeFunctions) {
     ASSERT_EQ(data.arity(), 1u);
     ASSERT_EQ(data.type(), entt::resolve<int>());
     ASSERT_EQ(data.arg(0u), entt::resolve<int>());
-    ASSERT_EQ(data.id(), "x"_hs);
     ASSERT_FALSE(data.is_const());
     ASSERT_FALSE(data.is_static());
     ASSERT_EQ(data.get(instance).cast<int>(), 0);
@@ -404,7 +399,6 @@ TEST_F(MetaData, SetterGetterAsMemberFunctions) {
     ASSERT_EQ(data.arity(), 1u);
     ASSERT_EQ(data.type(), entt::resolve<int>());
     ASSERT_EQ(data.arg(0u), entt::resolve<double>());
-    ASSERT_EQ(data.id(), "y"_hs);
     ASSERT_FALSE(data.is_const());
     ASSERT_FALSE(data.is_static());
     ASSERT_EQ(data.get(instance).cast<int>(), 0);
@@ -424,7 +418,6 @@ TEST_F(MetaData, SetterGetterWithRefAsMemberFunctions) {
     ASSERT_EQ(data.arity(), 1u);
     ASSERT_EQ(data.type(), entt::resolve<int>());
     ASSERT_EQ(data.arg(0u), entt::resolve<int>());
-    ASSERT_EQ(data.id(), "w"_hs);
     ASSERT_FALSE(data.is_const());
     ASSERT_FALSE(data.is_static());
     ASSERT_EQ(data.get(instance).cast<int>(), 0);
@@ -442,7 +435,6 @@ TEST_F(MetaData, SetterGetterMixed) {
     ASSERT_EQ(data.arity(), 1u);
     ASSERT_EQ(data.type(), entt::resolve<int>());
     ASSERT_EQ(data.arg(0u), entt::resolve<int>());
-    ASSERT_EQ(data.id(), "z"_hs);
     ASSERT_FALSE(data.is_const());
     ASSERT_FALSE(data.is_static());
     ASSERT_EQ(data.get(instance).cast<int>(), 0);
@@ -460,7 +452,6 @@ TEST_F(MetaData, SetterGetterReadOnly) {
     ASSERT_EQ(data.arity(), 0u);
     ASSERT_EQ(data.type(), entt::resolve<int>());
     ASSERT_EQ(data.arg(0u), entt::meta_type{});
-    ASSERT_EQ(data.id(), "z_ro"_hs);
     ASSERT_TRUE(data.is_const());
     ASSERT_FALSE(data.is_static());
     ASSERT_EQ(data.get(instance).cast<int>(), 0);
@@ -478,7 +469,6 @@ TEST_F(MetaData, SetterGetterReadOnlyDataMember) {
     ASSERT_EQ(data.arity(), 0u);
     ASSERT_EQ(data.type(), entt::resolve<int>());
     ASSERT_EQ(data.arg(0u), entt::meta_type{});
-    ASSERT_EQ(data.id(), "value"_hs);
     ASSERT_TRUE(data.is_const());
     ASSERT_FALSE(data.is_static());
     ASSERT_EQ(data.get(instance).cast<int>(), 0);
@@ -498,7 +488,6 @@ TEST_F(MetaData, MultiSetter) {
     ASSERT_EQ(data.arg(0u), entt::resolve<double>());
     ASSERT_EQ(data.arg(1u), entt::resolve<const char *>());
     ASSERT_EQ(data.arg(2u), entt::meta_type{});
-    ASSERT_EQ(data.id(), "value"_hs);
     ASSERT_FALSE(data.is_const());
     ASSERT_FALSE(data.is_static());
     ASSERT_EQ(data.get(instance).cast<int>(), 0);
@@ -547,7 +536,6 @@ TEST_F(MetaData, ArrayStatic) {
     ASSERT_EQ(data.arity(), 1u);
     ASSERT_EQ(data.type(), entt::resolve<int[3]>());
     ASSERT_EQ(data.arg(0u), entt::resolve<int[3]>());
-    ASSERT_EQ(data.id(), "global"_hs);
     ASSERT_FALSE(data.is_const());
     ASSERT_TRUE(data.is_static());
     ASSERT_TRUE(data.type().is_array());
@@ -564,7 +552,6 @@ TEST_F(MetaData, Array) {
     ASSERT_EQ(data.arity(), 1u);
     ASSERT_EQ(data.type(), entt::resolve<int[5]>());
     ASSERT_EQ(data.arg(0u), entt::resolve<int[5]>());
-    ASSERT_EQ(data.id(), "local"_hs);
     ASSERT_FALSE(data.is_const());
     ASSERT_FALSE(data.is_static());
     ASSERT_TRUE(data.type().is_array());