Explorar o código

stl: std::is_member_function_pointer_v

skypjack hai 1 mes
pai
achega
1dff52db92
Modificáronse 3 ficheiros con 3 adicións e 2 borrados
  1. 1 1
      src/entt/entity/helper.hpp
  2. 1 1
      src/entt/meta/utility.hpp
  3. 1 0
      src/entt/stl/type_traits.hpp

+ 1 - 1
src/entt/entity/helper.hpp

@@ -106,7 +106,7 @@ private:
  */
  */
 template<auto Member, typename Registry = stl::decay_t<nth_argument_t<0u, decltype(Member)>>>
 template<auto Member, typename Registry = stl::decay_t<nth_argument_t<0u, decltype(Member)>>>
 void invoke(Registry &reg, const typename Registry::entity_type entt) {
 void invoke(Registry &reg, const typename Registry::entity_type entt) {
-    static_assert(std::is_member_function_pointer_v<decltype(Member)>, "Invalid pointer to non-static member function");
+    static_assert(stl::is_member_function_pointer_v<decltype(Member)>, "Invalid pointer to non-static member function");
     (reg.template get<member_class_t<decltype(Member)>>(entt).*Member)(reg, entt);
     (reg.template get<member_class_t<decltype(Member)>>(entt).*Member)(reg, entt);
 }
 }
 
 

+ 1 - 1
src/entt/meta/utility.hpp

@@ -275,7 +275,7 @@ template<typename Type>
  */
  */
 template<typename Type, auto Data>
 template<typename Type, auto Data>
 [[nodiscard]] bool meta_setter([[maybe_unused]] meta_handle instance, [[maybe_unused]] meta_any value) {
 [[nodiscard]] bool meta_setter([[maybe_unused]] meta_handle instance, [[maybe_unused]] meta_any value) {
-    if constexpr(std::is_member_function_pointer_v<decltype(Data)> || stl::is_function_v<stl::remove_reference_t<stl::remove_pointer_t<decltype(Data)>>>) {
+    if constexpr(stl::is_member_function_pointer_v<decltype(Data)> || stl::is_function_v<stl::remove_reference_t<stl::remove_pointer_t<decltype(Data)>>>) {
         using descriptor = meta_function_helper_t<Type, decltype(Data)>;
         using descriptor = meta_function_helper_t<Type, decltype(Data)>;
         using data_type = type_list_element_t<descriptor::is_static, typename descriptor::args_type>;
         using data_type = type_list_element_t<descriptor::is_static, typename descriptor::args_type>;
 
 

+ 1 - 0
src/entt/stl/type_traits.hpp

@@ -35,6 +35,7 @@ using std::is_invocable_r;
 using std::is_invocable_r_v;
 using std::is_invocable_r_v;
 using std::is_invocable_v;
 using std::is_invocable_v;
 using std::is_lvalue_reference_v;
 using std::is_lvalue_reference_v;
+using std::is_member_function_pointer_v;
 using std::is_member_object_pointer_v;
 using std::is_member_object_pointer_v;
 using std::is_member_pointer_v;
 using std::is_member_pointer_v;
 using std::is_move_assignable_v;
 using std::is_move_assignable_v;