From 48ed04013824dd83fe2869b24cb0cbc65f7c23ab Mon Sep 17 00:00:00 2001 From: Jesus Perez Date: Mon, 29 Jan 2024 07:51:23 +0100 Subject: [PATCH] Refs #20262: Resolve conflicts Signed-off-by: Jesus Perez --- src/cpp/rtps/transport/TCPTransportInterface.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/cpp/rtps/transport/TCPTransportInterface.cpp b/src/cpp/rtps/transport/TCPTransportInterface.cpp index ac62719b148..431298a6b98 100644 --- a/src/cpp/rtps/transport/TCPTransportInterface.cpp +++ b/src/cpp/rtps/transport/TCPTransportInterface.cpp @@ -1317,17 +1317,11 @@ void TCPTransportInterface::SocketAccepted( channel->thread(std::thread(&TCPTransportInterface::perform_listen_operation, this, channel_weak_ptr, rtcp_manager_weak_ptr)); -<<<<<<< HEAD - EPROSIMA_LOG_INFO(RTCP, " Accepted connection (local: " << IPLocator::to_string(locator) - << ", remote: " << channel->remote_endpoint().address() - << ":" << channel->remote_endpoint().port() << ")"); -======= EPROSIMA_LOG_INFO(RTCP, "Accepted connection (local: " << channel->local_endpoint().address() << ":" << channel->local_endpoint().port() << "), remote: " << channel->remote_endpoint().address() << ":" << channel->remote_endpoint().port() << ")"); ->>>>>>> 36f7f57b0 (Fix wrong log info messages on TCP (#4258)) } else {