From fb135d7fe0d5265f3b50ea74a760e9f1c9862b33 Mon Sep 17 00:00:00 2001 From: who-biz <37732338+who-biz@users.noreply.github.com> Date: Thu, 20 Feb 2020 00:38:08 -0500 Subject: [PATCH] Fix implicit copy error on GCC 9+ --- contrib/epee/include/net/abstract_tcp_server2.inl | 1 - contrib/epee/include/net/net_utils_base.h | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/epee/include/net/abstract_tcp_server2.inl b/contrib/epee/include/net/abstract_tcp_server2.inl index 0ff2c9d6..ddb1e864 100644 --- a/contrib/epee/include/net/abstract_tcp_server2.inl +++ b/contrib/epee/include/net/abstract_tcp_server2.inl @@ -137,7 +137,6 @@ PRAGMA_WARNING_DISABLE_VS(4355) auto local_ep = socket_.local_endpoint(ec); CHECK_AND_NO_ASSERT_MES(!ec, false, "Failed to get local endpoint: " << ec.message() << ':' << ec.value()); - context = boost::value_initialized(); const unsigned long ip_{boost::asio::detail::socket_ops::host_to_network_long(remote_ep.address().to_v4().to_ulong())}; // create a random uuid diff --git a/contrib/epee/include/net/net_utils_base.h b/contrib/epee/include/net/net_utils_base.h index 7615786b..00870f56 100644 --- a/contrib/epee/include/net/net_utils_base.h +++ b/contrib/epee/include/net/net_utils_base.h @@ -228,6 +228,7 @@ namespace net_utils uint64_t m_send_cnt; double m_current_speed_down; double m_current_speed_up; + connection_context_base(const connection_context_base&) = default; connection_context_base(boost::uuids::uuid connection_id, const network_address &remote_address, bool is_income, @@ -262,10 +263,12 @@ namespace net_utils set_details(a.m_connection_id, a.m_remote_address, a.m_is_income); return *this; } + private: template friend class connection; + void set_details(boost::uuids::uuid connection_id, const network_address &remote_address, bool is_income) { this->~connection_context_base();