From f47ce5b620babe4b1079ebb1332b516d3b409773 Mon Sep 17 00:00:00 2001 From: dannuic Date: Sat, 25 Apr 2026 15:01:45 -0600 Subject: [PATCH] cleaned up and used require syntax for constraints --- zone/client_version.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/zone/client_version.h b/zone/client_version.h index 66b6d77f7..5e4e9ce10 100644 --- a/zone/client_version.h +++ b/zone/client_version.h @@ -18,9 +18,9 @@ namespace ClientPatch { using ClientList = std::unordered_map; template +requires std::is_member_function_pointer_v static void QueuePacket(Client* c, Fun fun, Obj* obj, Args&&... args) { - static_assert(std::is_member_function_pointer_v); std::unique_ptr app = std::invoke(fun, obj, std::forward(args)...); if (app) c->QueuePacket(app.get()); @@ -30,9 +30,9 @@ static void QueuePacket(Client* c, Fun fun, Obj* obj, Args&&... args) static auto QueueClients(Mob* sender, bool ignore_sender = false, bool ackreq = true) { return [=](Fun fun, - std::function component_getter, Args&&... args) { - static_assert(std::is_member_function_pointer_v && "Function is required to be a member function"); - + std::function component_getter, Args&&... args) + requires std::is_member_function_pointer_v + { std::vector>> build_packets; std::unordered_map client_list = entity_list.GetClientList(); @@ -62,9 +62,9 @@ static auto QueueCloseClients( if (distance <= 0) distance = static_cast(zone->GetClientUpdateRange()); return [=](Fun fun, - std::function component_getter, Args&&... args) { - static_assert(std::is_member_function_pointer_v, "Function is required to be a member function"); - + std::function component_getter, Args&&... args) + requires std::is_member_function_pointer_v + { if (sender == nullptr) { QueueClients(sender, ignore_sender, is_ack_required)(fun, component_getter, std::forward(args)...); } else {