diff --git a/natvis/entt/meta.natvis b/natvis/entt/meta.natvis
index 5a97e25c3..360ac183d 100644
--- a/natvis/entt/meta.natvis
+++ b/natvis/entt/meta.natvis
@@ -96,9 +96,9 @@
- has_trait(entt::internal::meta_traits::is_enum)
- has_trait(entt::internal::meta_traits::is_class)
- has_trait(entt::internal::meta_traits::is_pointer)
- - has_trait(entt::internal::meta_traits::is_meta_pointer_like)
- - has_trait(entt::internal::meta_traits::is_meta_sequence_container)
- - has_trait(entt::internal::meta_traits::is_meta_associative_container)
+ - has_trait(entt::internal::meta_traits::is_pointer_like)
+ - has_trait(entt::internal::meta_traits::is_sequence_container)
+ - has_trait(entt::internal::meta_traits::is_associative_container)
- default_constructor != nullptr
- conversion_helper != nullptr
- from_void != nullptr
diff --git a/src/entt/meta/meta.hpp b/src/entt/meta/meta.hpp
index 6363a479d..8ee19fff9 100644
--- a/src/entt/meta/meta.hpp
+++ b/src/entt/meta/meta.hpp
@@ -171,7 +171,7 @@ class meta_any {
static_assert(std::is_same_v>, Type>, "Invalid type");
if constexpr(is_meta_pointer_like_v) {
- if(!!(req & internal::meta_traits::is_meta_pointer_like)) {
+ if(!!(req & internal::meta_traits::is_pointer_like)) {
if constexpr(std::is_function_v::element_type>) {
static_cast(other)->emplace(*static_cast(self.data()));
} else if constexpr(!std::is_void_v::element_type>>) {
@@ -189,13 +189,13 @@ class meta_any {
}
if constexpr(is_complete_v>) {
- if(!!(req & internal::meta_traits::is_meta_sequence_container)) {
+ if(!!(req & internal::meta_traits::is_sequence_container)) {
*static_cast(other) = !!(req & internal::meta_traits::is_const) ? meta_sequence_container{*self.ctx, *static_cast(self.data())} : meta_sequence_container{*self.ctx, *static_cast(const_cast(self.data()))};
}
}
if constexpr(is_complete_v>) {
- if(!!(req & internal::meta_traits::is_meta_associative_container)) {
+ if(!!(req & internal::meta_traits::is_associative_container)) {
*static_cast(other) = !!(req & internal::meta_traits::is_const) ? meta_associative_container{*self.ctx, *static_cast(self.data())} : meta_associative_container{*self.ctx, *static_cast(const_cast(self.data()))};
}
}
@@ -526,14 +526,14 @@ public:
*/
[[nodiscard]] meta_sequence_container as_sequence_container() noexcept {
meta_sequence_container proxy{};
- vtable(internal::meta_traits::is_meta_sequence_container | (storage.policy() == any_policy::cref ? internal::meta_traits::is_const : internal::meta_traits::is_none), *this, &proxy);
+ vtable(internal::meta_traits::is_sequence_container | (storage.policy() == any_policy::cref ? internal::meta_traits::is_const : internal::meta_traits::is_none), *this, &proxy);
return proxy;
}
/*! @copydoc as_sequence_container */
[[nodiscard]] meta_sequence_container as_sequence_container() const noexcept {
meta_sequence_container proxy{};
- vtable(internal::meta_traits::is_meta_sequence_container | internal::meta_traits::is_const, *this, &proxy);
+ vtable(internal::meta_traits::is_sequence_container | internal::meta_traits::is_const, *this, &proxy);
return proxy;
}
@@ -543,14 +543,14 @@ public:
*/
[[nodiscard]] meta_associative_container as_associative_container() noexcept {
meta_associative_container proxy{};
- vtable(internal::meta_traits::is_meta_associative_container | (storage.policy() == any_policy::cref ? internal::meta_traits::is_const : internal::meta_traits::is_none), *this, &proxy);
+ vtable(internal::meta_traits::is_associative_container | (storage.policy() == any_policy::cref ? internal::meta_traits::is_const : internal::meta_traits::is_none), *this, &proxy);
return proxy;
}
/*! @copydoc as_associative_container */
[[nodiscard]] meta_associative_container as_associative_container() const noexcept {
meta_associative_container proxy{};
- vtable(internal::meta_traits::is_meta_associative_container | internal::meta_traits::is_const, *this, &proxy);
+ vtable(internal::meta_traits::is_associative_container | internal::meta_traits::is_const, *this, &proxy);
return proxy;
}
@@ -561,7 +561,7 @@ public:
*/
[[nodiscard]] meta_any operator*() const noexcept {
meta_any ret{meta_ctx_arg, *ctx};
- vtable(internal::meta_traits::is_meta_pointer_like, *this, &ret);
+ vtable(internal::meta_traits::is_pointer_like, *this, &ret);
return ret;
}
@@ -1219,7 +1219,7 @@ public:
* @return True if the underlying type is pointer-like, false otherwise.
*/
[[nodiscard]] bool is_pointer_like() const noexcept {
- return static_cast(node.traits & internal::meta_traits::is_meta_pointer_like);
+ return static_cast(node.traits & internal::meta_traits::is_pointer_like);
}
/**
@@ -1227,7 +1227,7 @@ public:
* @return True if the type is a sequence container, false otherwise.
*/
[[nodiscard]] bool is_sequence_container() const noexcept {
- return static_cast(node.traits & internal::meta_traits::is_meta_sequence_container);
+ return static_cast(node.traits & internal::meta_traits::is_sequence_container);
}
/**
@@ -1235,7 +1235,7 @@ public:
* @return True if the type is an associative container, false otherwise.
*/
[[nodiscard]] bool is_associative_container() const noexcept {
- return static_cast(node.traits & internal::meta_traits::is_meta_associative_container);
+ return static_cast(node.traits & internal::meta_traits::is_associative_container);
}
/**
diff --git a/src/entt/meta/node.hpp b/src/entt/meta/node.hpp
index 7cc87a408..9338c6891 100644
--- a/src/entt/meta/node.hpp
+++ b/src/entt/meta/node.hpp
@@ -37,9 +37,9 @@ enum class meta_traits : std::uint32_t {
is_enum = 0x0040,
is_class = 0x0080,
is_pointer = 0x0100,
- is_meta_pointer_like = 0x0200,
- is_meta_sequence_container = 0x0400,
- is_meta_associative_container = 0x0800,
+ is_pointer_like = 0x0200,
+ is_sequence_container = 0x0400,
+ is_associative_container = 0x0800,
_user_defined_traits = 0xFFFF,
_entt_enum_as_bitmask = 0xFFFF
};
@@ -264,9 +264,9 @@ template
| (std::is_enum_v ? meta_traits::is_enum : meta_traits::is_none)
| (std::is_class_v ? meta_traits::is_class : meta_traits::is_none)
| (std::is_pointer_v ? meta_traits::is_pointer : meta_traits::is_none)
- | (is_meta_pointer_like_v ? meta_traits::is_meta_pointer_like : meta_traits::is_none)
- | (is_complete_v> ? meta_traits::is_meta_sequence_container : meta_traits::is_none)
- | (is_complete_v> ? meta_traits::is_meta_associative_container : meta_traits::is_none),
+ | (is_meta_pointer_like_v ? meta_traits::is_pointer_like : meta_traits::is_none)
+ | (is_complete_v> ? meta_traits::is_sequence_container : meta_traits::is_none)
+ | (is_complete_v> ? meta_traits::is_associative_container : meta_traits::is_none),
size_of_v,
&resolve,
&resolve>>};