Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-30 16:00:01 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fixes for ASIO 1.20.0

Browse Source
This commit is contained in:
Miodrag Milanovic 2022-03-01 11:44:28 +01:00
parent cdcfa1d74a
commit ef98b0220d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/util/client_ws.hpp
View File

@ -11,6 +11,7 @@
#include <atomic> #include <atomic>
#include <list> #include <list>
#include "crypto.hpp" #include "crypto.hpp"
#include "base64.hpp"
#ifndef CASE_INSENSITIVE_EQUALS_AND_HASH #ifndef CASE_INSENSITIVE_EQUALS_AND_HASH
#define CASE_INSENSITIVE_EQUALS_AND_HASH #define CASE_INSENSITIVE_EQUALS_AND_HASH
@ -65,7 +66,7 @@ namespace webpp {
unsigned short remote_endpoint_port; unsigned short remote_endpoint_port;
private: private:
explicit Connection(socket_type* socket): remote_endpoint_port(0), socket(socket), strand(socket->get_io_context()), closed(false) { } explicit Connection(asio::io_context &context, socket_type* socket): remote_endpoint_port(0), socket(socket), strand(context), closed(false) { }
class SendData { class SendData {
public: public:
@ -488,7 +489,7 @@ namespace webpp {
resolver->async_resolve(query, [this] resolver->async_resolve(query, [this]
(const std::error_code &ec, asio::ip::tcp::resolver::iterator it){ (const std::error_code &ec, asio::ip::tcp::resolver::iterator it){
if(!ec) { if(!ec) {
connection=std::shared_ptr<Connection>(new Connection(new WS(*io_context))); connection=std::shared_ptr<Connection>(new Connection(*io_context, new WS(*io_context)));
asio::async_connect(*connection->socket, it, [this] asio::async_connect(*connection->socket, it, [this]
(const std::error_code &ec, asio::ip::tcp::resolver::iterator /*it*/){ (const std::error_code &ec, asio::ip::tcp::resolver::iterator /*it*/){

2
src/lib/util/client_wss.hpp
View File

@ -45,7 +45,7 @@ namespace webpp {
resolver->async_resolve(query, [this] resolver->async_resolve(query, [this]
(const std::error_code &ec, asio::ip::tcp::resolver::iterator it){ (const std::error_code &ec, asio::ip::tcp::resolver::iterator it){
if(!ec) { if(!ec) {
connection=std::shared_ptr<Connection>(new Connection(new WSS(*io_context, context))); connection=std::shared_ptr<Connection>(new Connection(*io_context, new WSS(*io_context, context)));
asio::async_connect(connection->socket->lowest_layer(), it, [this] asio::async_connect(connection->socket->lowest_layer(), it, [this]
(const std::error_code &ec, asio::ip::tcp::resolver::iterator /*it*/){ (const std::error_code &ec, asio::ip::tcp::resolver::iterator /*it*/){