From a79b4a03a6dc00278d4cb4e95850caabdbc1111f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D1=80=D0=B5=D0=BF=D0=BE=D0=B4=D0=BE=D0=B1=D0=BD?= =?UTF-8?q?=D1=8B=D0=B9=20=D0=90=D0=BB=D0=B5=D0=BD?= Date: Wed, 3 Dec 2025 22:56:03 +0300 Subject: [PATCH] Adaptation to libdelphi v2.11+. --- src/modules/Workers/WebService/WebService.cpp | 4 ++-- src/modules/Workers/WebSocket/WebSocket.cpp | 4 ++-- src/modules/Workers/WebSocket/WebSocketClient.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/modules/Workers/WebService/WebService.cpp b/src/modules/Workers/WebService/WebService.cpp index 10fb7ee..1789a5a 100644 --- a/src/modules/Workers/WebService/WebService.cpp +++ b/src/modules/Workers/WebService/WebService.cpp @@ -230,7 +230,7 @@ namespace Apostol { CHTTPProxy *CWebService::GetProxy(CHTTPServerConnection *AConnection) { auto pProxy = m_ProxyManager.Add(AConnection); #if defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE >= 9) - pProxy->OnVerbose([this](auto && Sender, auto && AConnection, auto && AFormat, auto && args) { DoVerbose(Sender, AConnection, AFormat, args); }); + //pProxy->OnVerbose([this](auto && Sender, auto && AFormat, auto && args) { DoVerbose(Sender, AFormat, args); }); pProxy->OnExecute([this](auto && AConnection) { return DoProxyExecute(AConnection); }); @@ -240,7 +240,7 @@ namespace Apostol { pProxy->OnConnected([this](auto && Sender) { DoProxyConnected(Sender); }); pProxy->OnDisconnected([this](auto && Sender) { DoProxyDisconnected(Sender); }); #else - pProxy->OnVerbose(std::bind(&CWebService::DoVerbose, this, _1, _2, _3, _4)); + //pProxy->OnVerbose(std::bind(&CWebService::DoVerbose, this, _1, _2, _3)); pProxy->OnExecute(std::bind(&CWebService::DoProxyExecute, this, _1)); diff --git a/src/modules/Workers/WebSocket/WebSocket.cpp b/src/modules/Workers/WebSocket/WebSocket.cpp index 1ec9464..58598c1 100644 --- a/src/modules/Workers/WebSocket/WebSocket.cpp +++ b/src/modules/Workers/WebSocket/WebSocket.cpp @@ -88,7 +88,7 @@ namespace Apostol { pClient->AllocateEventHandlers(Server()); #if defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE >= 9) - pClient->OnVerbose([this](auto && Sender, auto && AConnection, auto && AFormat, auto && args) { DoVerbose(Sender, AConnection, AFormat, args); }); + //pClient->OnVerbose([this](auto && Sender, auto && AFormat, auto && args) { DoVerbose(Sender, AFormat, args); }); pClient->OnException([this](auto && AConnection, auto && AException) { DoException(AConnection, AException); }); pClient->OnEventHandlerException([this](auto && AHandler, auto && AException) { DoEventHandlerException(AHandler, AException); }); pClient->OnNoCommandHandler([this](auto && Sender, auto && AData, auto && AConnection) { DoNoCommandHandler(Sender, AData, AConnection); }); @@ -104,7 +104,7 @@ namespace Apostol { pClient->OnKey([this](auto && Sender, auto && Request, auto && Response) { DoKeyEvent(Sender, Request, Response); }); pClient->OnWebSocketEvent([this](auto && Sender, auto && Request, auto && Response) { DoWebSocketClientEvent(Sender, Request, Response); }); #else - pClient->OnVerbose(std::bind(&CWebSocketModule::DoVerbose, this, _1, _2, _3, _4)); + //pClient->OnVerbose(std::bind(&CWebSocketModule::DoVerbose, this, _1, _2, _3)); pClient->OnException(std::bind(&CWebSocketModule::DoException, this, _1, _2)); pClient->OnEventHandlerException(std::bind(&CWebSocketModule::DoEventHandlerException, this, _1, _2)); pClient->OnNoCommandHandler(std::bind(&CWebSocketModule::DoNoCommandHandler, this, _1, _2, _3)); diff --git a/src/modules/Workers/WebSocket/WebSocketClient.cpp b/src/modules/Workers/WebSocket/WebSocketClient.cpp index 8c40a28..42aa59c 100644 --- a/src/modules/Workers/WebSocket/WebSocketClient.cpp +++ b/src/modules/Workers/WebSocket/WebSocketClient.cpp @@ -215,7 +215,7 @@ namespace Apostol { m_PongDateTime = Now; if (Now - m_PongDateTime >= (CDateTime) 90 / SecsPerDay) { - DoTimeOut(); + //DoTimeOut(); return; }