private/apostol-dm
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adaptation to libdelphi v2.11+.

Browse Source
This commit is contained in:
Преподобный Ален
2025-12-03 22:56:03 +03:00
parent c8e5543688
commit a79b4a03a6
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/Workers/WebService/WebService.cpp
View File

@@ -230,7 +230,7 @@ namespace Apostol {
CHTTPProxy *CWebService::GetProxy(CHTTPServerConnection *AConnection) { CHTTPProxy *CWebService::GetProxy(CHTTPServerConnection *AConnection) {
auto pProxy = m_ProxyManager.Add(AConnection); auto pProxy = m_ProxyManager.Add(AConnection);
#if defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE >= 9) #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); }); pProxy->OnExecute([this](auto && AConnection) { return DoProxyExecute(AConnection); });
@@ -240,7 +240,7 @@ namespace Apostol {
pProxy->OnConnected([this](auto && Sender) { DoProxyConnected(Sender); }); pProxy->OnConnected([this](auto && Sender) { DoProxyConnected(Sender); });
pProxy->OnDisconnected([this](auto && Sender) { DoProxyDisconnected(Sender); }); pProxy->OnDisconnected([this](auto && Sender) { DoProxyDisconnected(Sender); });
#else #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)); pProxy->OnExecute(std::bind(&CWebService::DoProxyExecute, this, _1));

4
src/modules/Workers/WebSocket/WebSocket.cpp
View File

@@ -88,7 +88,7 @@ namespace Apostol {
pClient->AllocateEventHandlers(Server()); pClient->AllocateEventHandlers(Server());
#if defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE >= 9) #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->OnException([this](auto && AConnection, auto && AException) { DoException(AConnection, AException); });
pClient->OnEventHandlerException([this](auto && AHandler, auto && AException) { DoEventHandlerException(AHandler, AException); }); pClient->OnEventHandlerException([this](auto && AHandler, auto && AException) { DoEventHandlerException(AHandler, AException); });
pClient->OnNoCommandHandler([this](auto && Sender, auto && AData, auto && AConnection) { DoNoCommandHandler(Sender, AData, AConnection); }); 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->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); }); pClient->OnWebSocketEvent([this](auto && Sender, auto && Request, auto && Response) { DoWebSocketClientEvent(Sender, Request, Response); });
#else #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->OnException(std::bind(&CWebSocketModule::DoException, this, _1, _2));
pClient->OnEventHandlerException(std::bind(&CWebSocketModule::DoEventHandlerException, this, _1, _2)); pClient->OnEventHandlerException(std::bind(&CWebSocketModule::DoEventHandlerException, this, _1, _2));
pClient->OnNoCommandHandler(std::bind(&CWebSocketModule::DoNoCommandHandler, this, _1, _2, _3)); pClient->OnNoCommandHandler(std::bind(&CWebSocketModule::DoNoCommandHandler, this, _1, _2, _3));

2
src/modules/Workers/WebSocket/WebSocketClient.cpp
View File

@@ -215,7 +215,7 @@ namespace Apostol {
m_PongDateTime = Now; m_PongDateTime = Now;
if (Now - m_PongDateTime >= (CDateTime) 90 / SecsPerDay) { if (Now - m_PongDateTime >= (CDateTime) 90 / SecsPerDay) {
DoTimeOut(); //DoTimeOut();
return; return;
} }