From 86e2235b8346e9fa51ef6ccd3dd0cdb5c421b5fe Mon Sep 17 00:00:00 2001 From: skypjack Date: Thu, 2 Apr 2026 09:34:29 +0200 Subject: [PATCH] stl: std::is_pointer_v --- src/entt/container/dense_map.hpp | 4 ++-- src/entt/container/dense_set.hpp | 4 ++-- src/entt/meta/factory.hpp | 4 ++-- src/entt/meta/node.hpp | 2 +- src/entt/meta/utility.hpp | 4 ++-- src/entt/stl/type_traits.hpp | 1 + 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/entt/container/dense_map.hpp b/src/entt/container/dense_map.hpp index 2929b3481..24b97f9d8 100644 --- a/src/entt/container/dense_map.hpp +++ b/src/entt/container/dense_map.hpp @@ -60,7 +60,7 @@ class dense_map_iterator final { template friend class dense_map_iterator; - static_assert(std::is_pointer_v, "Not a pointer type"); + static_assert(stl::is_pointer_v, "Not a pointer type"); using first_type = decltype(stl::as_const(stl::declval()->element.first)); using second_type = decltype((stl::declval()->element.second)); @@ -155,7 +155,7 @@ class dense_map_local_iterator final { template friend class dense_map_local_iterator; - static_assert(std::is_pointer_v, "Not a pointer type"); + static_assert(stl::is_pointer_v, "Not a pointer type"); using first_type = decltype(stl::as_const(stl::declval()->element.first)); using second_type = decltype((stl::declval()->element.second)); diff --git a/src/entt/container/dense_set.hpp b/src/entt/container/dense_set.hpp index 374894450..9a2b36200 100644 --- a/src/entt/container/dense_set.hpp +++ b/src/entt/container/dense_set.hpp @@ -32,7 +32,7 @@ class dense_set_iterator final { template friend class dense_set_iterator; - static_assert(std::is_pointer_v, "Not a pointer type"); + static_assert(stl::is_pointer_v, "Not a pointer type"); public: using value_type = std::remove_const_t>::second_type; @@ -124,7 +124,7 @@ class dense_set_local_iterator final { template friend class dense_set_local_iterator; - static_assert(std::is_pointer_v, "Not a pointer type"); + static_assert(stl::is_pointer_v, "Not a pointer type"); public: using value_type = std::remove_const_t>::second_type; diff --git a/src/entt/meta/factory.hpp b/src/entt/meta/factory.hpp index d2ee50989..05b4aa6e6 100644 --- a/src/entt/meta/factory.hpp +++ b/src/entt/meta/factory.hpp @@ -372,7 +372,7 @@ public: } else { using data_type = stl::remove_pointer_t; - if constexpr(std::is_pointer_v) { + if constexpr(stl::is_pointer_v) { static_assert(Policy::template value, "Invalid return type for the given policy"); } else { static_assert(Policy::template value, "Invalid return type for the given policy"); @@ -382,7 +382,7 @@ public: internal::meta_data_node{ id, name, - ((!std::is_pointer_v || std::is_const_v) ? internal::meta_traits::is_const : internal::meta_traits::is_none) | internal::meta_traits::is_static, + ((!stl::is_pointer_v || std::is_const_v) ? internal::meta_traits::is_const : internal::meta_traits::is_none) | internal::meta_traits::is_static, 1u, &internal::resolve>, &meta_arg>>, diff --git a/src/entt/meta/node.hpp b/src/entt/meta/node.hpp index 031879488..64763f669 100644 --- a/src/entt/meta/node.hpp +++ b/src/entt/meta/node.hpp @@ -221,7 +221,7 @@ auto setup_node_for() noexcept { | (std::is_array_v ? meta_traits::is_array : meta_traits::is_none) | (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) + | (stl::is_pointer_v ? meta_traits::is_pointer : 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), diff --git a/src/entt/meta/utility.hpp b/src/entt/meta/utility.hpp index 65b21c471..9fa4647e6 100644 --- a/src/entt/meta/utility.hpp +++ b/src/entt/meta/utility.hpp @@ -292,7 +292,7 @@ template return true; } } - } else if constexpr(std::is_pointer_v) { + } else if constexpr(stl::is_pointer_v) { using data_type = std::remove_reference_t; if constexpr(!std::is_array_v && !std::is_const_v) { @@ -332,7 +332,7 @@ template } return meta_any{meta_ctx_arg, instance->context()}; - } else if constexpr(std::is_pointer_v) { + } else if constexpr(stl::is_pointer_v) { if constexpr(std::is_array_v>) { return meta_any{meta_ctx_arg, instance->context()}; } else { diff --git a/src/entt/stl/type_traits.hpp b/src/entt/stl/type_traits.hpp index 245c670fd..4d0b60cfd 100644 --- a/src/entt/stl/type_traits.hpp +++ b/src/entt/stl/type_traits.hpp @@ -10,6 +10,7 @@ using std::false_type; using std::invoke_result_t; using std::is_invocable_r_v; using std::is_member_object_pointer_v; +using std::is_pointer_v; using std::is_same_v; using std::is_void_v; using std::remove_cvref_t;