Prechádzať zdrojové kódy

meta: drop useless key_only func on meta assoc containers

skypjack 2 rokov pred
rodič
commit
f20b9e3875
2 zmenil súbory, kde vykonal 0 pridanie a 17 odobranie
  1. 0 11
      src/entt/meta/meta.hpp
  2. 0 6
      test/entt/meta/meta_container.cpp

+ 0 - 11
src/entt/meta/meta.hpp

@@ -145,12 +145,10 @@ public:
             mapped_type_node = &internal::resolve<typename Type::mapped_type>;
         }
 
-        key_only_container = meta_associative_container_traits<Type>::key_only;
         vtable = meta_associative_container_traits<Type>::basic_vtable;
         storage = std::move(instance);
     }
 
-    [[nodiscard]] inline bool key_only() const noexcept;
     [[nodiscard]] inline meta_type key_type() const noexcept;
     [[nodiscard]] inline meta_type mapped_type() const noexcept;
     [[nodiscard]] inline meta_type value_type() const noexcept;
@@ -166,7 +164,6 @@ public:
 
 private:
     const meta_ctx *ctx{};
-    bool key_only_container{};
     internal::meta_type_node (*key_type_node)(const internal::meta_context &){};
     internal::meta_type_node (*mapped_type_node)(const internal::meta_context &){};
     internal::meta_type_node (*value_type_node)(const internal::meta_context &){};
@@ -1956,14 +1953,6 @@ inline meta_sequence_container::iterator meta_sequence_container::erase(iterator
     return static_cast<bool>(storage);
 }
 
-/**
- * @brief Returns true if a container is also key-only, false otherwise.
- * @return True if the associative container is also key-only, false otherwise.
- */
-[[nodiscard]] inline bool meta_associative_container::key_only() const noexcept {
-    return key_only_container;
-}
-
 /**
  * @brief Returns the meta key type of a container.
  * @return The meta key type of the a container.

+ 0 - 6
test/entt/meta/meta_container.cpp

@@ -314,7 +314,6 @@ TEST(MetaContainer, StdMap) {
     auto view = any.as_associative_container();
 
     ASSERT_TRUE(view);
-    ASSERT_FALSE(view.key_only());
     ASSERT_EQ(view.key_type(), entt::resolve<int>());
     ASSERT_EQ(view.mapped_type(), entt::resolve<char>());
     ASSERT_EQ(view.value_type(), (entt::resolve<std::pair<const int, char>>()));
@@ -358,7 +357,6 @@ TEST(MetaContainer, StdSet) {
     auto view = any.as_associative_container();
 
     ASSERT_TRUE(view);
-    ASSERT_TRUE(view.key_only());
     ASSERT_EQ(view.key_type(), entt::resolve<int>());
     ASSERT_EQ(view.mapped_type(), entt::meta_type{});
     ASSERT_EQ(view.value_type(), entt::resolve<int>());
@@ -405,7 +403,6 @@ TEST(MetaContainer, DenseMap) {
     map.emplace(4, '3');
 
     ASSERT_TRUE(view);
-    ASSERT_FALSE(view.key_only());
     ASSERT_EQ(view.key_type(), entt::resolve<int>());
     ASSERT_EQ(view.mapped_type(), entt::resolve<char>());
     ASSERT_EQ(view.value_type(), (entt::resolve<std::pair<const int, char>>()));
@@ -453,7 +450,6 @@ TEST(MetaContainer, DenseSet) {
     set.emplace(4);
 
     ASSERT_TRUE(view);
-    ASSERT_TRUE(view.key_only());
     ASSERT_EQ(view.key_type(), entt::resolve<int>());
     ASSERT_EQ(view.mapped_type(), entt::meta_type{});
     ASSERT_EQ(view.value_type(), entt::resolve<int>());
@@ -544,7 +540,6 @@ TEST(MetaContainer, ConstKeyValueAssociativeContainer) {
     auto view = any.as_associative_container();
 
     ASSERT_TRUE(view);
-    ASSERT_FALSE(view.key_only());
     ASSERT_EQ(view.key_type(), entt::resolve<int>());
     ASSERT_EQ(view.mapped_type(), entt::resolve<char>());
     ASSERT_EQ(view.value_type(), (entt::resolve<std::pair<const int, char>>()));
@@ -587,7 +582,6 @@ TEST(MetaContainer, ConstKeyOnlyAssociativeContainer) {
     auto view = any.as_associative_container();
 
     ASSERT_TRUE(view);
-    ASSERT_TRUE(view.key_only());
     ASSERT_EQ(view.key_type(), entt::resolve<int>());
     ASSERT_EQ(view.mapped_type(), entt::meta_type{});
     ASSERT_EQ(view.value_type(), (entt::resolve<int>()));