From 7db83b6daff256ef919894992ae98abb80082a89 Mon Sep 17 00:00:00 2001 From: WLs50 Date: Sun, 9 Mar 2025 22:07:42 +0100 Subject: [PATCH] -replace deprecated asio api function -add missing stl include --- manul/renderer/source/materialparser.h | 1 + network/backend/asio.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/manul/renderer/source/materialparser.h b/manul/renderer/source/materialparser.h index 2db2a677..ebd7c9c2 100644 --- a/manul/renderer/source/materialparser.h +++ b/manul/renderer/source/materialparser.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include #include #include diff --git a/network/backend/asio.cpp b/network/backend/asio.cpp index 4be7fa59..f5d2d13d 100644 --- a/network/backend/asio.cpp +++ b/network/backend/asio.cpp @@ -136,7 +136,7 @@ void network::tcp::connection::send_message(const message &msg) network::tcp::server::server(std::shared_ptr buf, asio::io_context &io_ctx, const std::string &host, uint32_t port) : network::server(buf), m_acceptor(io_ctx), m_io_ctx(io_ctx) { - auto endpoint = asio::ip::tcp::endpoint(asio::ip::address::from_string(host), port); + auto endpoint = asio::ip::tcp::endpoint(asio::ip::make_address(host), port); m_acceptor.open(endpoint.protocol()); m_acceptor.set_option(asio::socket_base::reuse_address(true)); m_acceptor.set_option(asio::ip::tcp::no_delay(true)); @@ -186,7 +186,7 @@ void network::tcp::client::connect() conn->set_handler(std::bind(&client::handle_message, this, conn, std::placeholders::_1)); asio::ip::tcp::endpoint endpoint( - asio::ip::address::from_string(host), port); + asio::ip::make_address(host), port); conn->m_socket.open(endpoint.protocol()); conn->m_socket.set_option(asio::ip::tcp::no_delay(true)); conn->m_socket.async_connect(endpoint,