diff options
| -rw-r--r-- | src/server/bnetserver/REST/LoginRESTService.cpp | 8 | ||||
| -rw-r--r-- | src/server/game/Services/WorldserverService.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/server/bnetserver/REST/LoginRESTService.cpp b/src/server/bnetserver/REST/LoginRESTService.cpp index 30b8a9fda75..bb1f4541080 100644 --- a/src/server/bnetserver/REST/LoginRESTService.cpp +++ b/src/server/bnetserver/REST/LoginRESTService.cpp @@ -146,9 +146,9 @@ void LoginRESTService::Run() { nullptr, nullptr } }; - soap_register_plugin_arg(&soapServer, &http_get, handle_get_plugin); + soap_register_plugin_arg(&soapServer, &http_get, (void*)&handle_get_plugin); soap_register_plugin_arg(&soapServer, &http_post, handlers); - soap_register_plugin_arg(&soapServer, &ContentTypePlugin::Init, "application/json;charset=utf-8"); + soap_register_plugin_arg(&soapServer, &ContentTypePlugin::Init, (void*)"application/json;charset=utf-8"); // Use our already ready ssl context soapServer.ctx = Battlenet::SslContext::instance().native_handle(); @@ -159,7 +159,7 @@ void LoginRESTService::Run() if (!soap_valid_socket(soap_accept(&soapServer))) continue; // ran into an accept timeout - std::unique_ptr<soap> soapClient = Trinity::make_unique<soap>(soapServer); + std::shared_ptr<soap> soapClient = std::make_shared<soap>(soapServer); boost::asio::ip::address_v4 address(soapClient->ip); if (soap_ssl_accept(soapClient.get()) != SOAP_OK) { @@ -169,7 +169,7 @@ void LoginRESTService::Run() TC_LOG_DEBUG("server.rest", "Accepted connection from IP=%s", address.to_string().c_str()); - std::thread([soapClient{ std::move(soapClient) }] + std::thread([soapClient] { soap_serve(soapClient.get()); }).detach(); diff --git a/src/server/game/Services/WorldserverService.h b/src/server/game/Services/WorldserverService.h index 768fb164c13..f617a87ea58 100644 --- a/src/server/game/Services/WorldserverService.h +++ b/src/server/game/Services/WorldserverService.h @@ -45,7 +45,7 @@ namespace Battlenet protected: void SendRequest(uint32 serviceHash, uint32 methodId, google::protobuf::Message const* request, std::function<void(MessageBuffer)> callback) override { _session->SendBattlenetRequest(serviceHash, methodId, request, std::move(callback)); } void SendRequest(uint32 serviceHash, uint32 methodId, google::protobuf::Message const* request) override { _session->SendBattlenetRequest(serviceHash, methodId, request); } - void SendResponse(uint32 serviceHash, uint32 methodId, uint32 token, uint32 status) { _session->SendBattlenetResponse(serviceHash, methodId, token, status); } + void SendResponse(uint32 serviceHash, uint32 methodId, uint32 token, uint32 status) override { _session->SendBattlenetResponse(serviceHash, methodId, token, status); } void SendResponse(uint32 serviceHash, uint32 methodId, uint32 token, google::protobuf::Message const* response) override { _session->SendBattlenetResponse(serviceHash, methodId, token, response); } std::string GetCallerInfo() const override { return _session->GetPlayerInfo(); } |