eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'manul-staging' of https://github.com/wls50/maszyna-internal into manul-staging

Browse Source
This commit is contained in:
Hirek
2025-03-09 22:10:02 +01:00
parent cd860dd957 7db83b6daf
commit 7f9cab7129
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
manul/renderer/source/materialparser.h
View File

@@ -1,6 +1,7 @@
#pragma once
#include <memory>
#include <string>
#include <string_view>
#include <optional>
#include <unordered_map>

4
network/backend/asio.cpp
View File

@@ -136,7 +136,7 @@ void network::tcp::connection::send_message(const message &msg)
network::tcp::server::server(std::shared_ptr<std::istream> 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,