Refs #20179: Solve conflicts

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
eProsima · Mar 7, 2024 · 8c1bfe5 · 8c1bfe5
1 parent 95d7ba1
commit 8c1bfe5
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 26 deletions.
diff --git a/src/cpp/rtps/transport/TCPTransportInterface.cpp b/src/cpp/rtps/transport/TCPTransportInterface.cpp
@@ -205,9 +205,6 @@ void TCPTransportInterface::clean()
         }
     }
 
-<<<<<<< HEAD
-    if (io_service_thread_)
-=======
     if (initial_peer_local_locator_socket_)
     {
         if (initial_peer_local_locator_socket_->is_open())
@@ -218,8 +215,7 @@ void TCPTransportInterface::clean()
         initial_peer_local_locator_socket_.reset();
     }
 
-    if (io_service_thread_.joinable())
->>>>>>> b43f3a065 (TCP unique client announced local port (#4216))
+    if (io_service_thread_)
     {
         io_service_.stop();
         io_service_thread_->join();
@@ -1699,15 +1695,6 @@ void TCPTransportInterface::update_network_interfaces()
     // TODO(jlbueno)
 }
 
-<<<<<<< HEAD
-=======
-bool TCPTransportInterface::is_localhost_allowed() const
-{
-    Locator local_locator;
-    fill_local_ip(local_locator);
-    return is_locator_allowed(local_locator);
-}
-
 void TCPTransportInterface::fill_local_physical_port(
         Locator& locator) const
 {
@@ -1721,7 +1708,6 @@ void TCPTransportInterface::fill_local_physical_port(
     }
 }
 
->>>>>>> b43f3a065 (TCP unique client announced local port (#4216))
 } // namespace rtps
 } // namespace fastrtps
 } // namespace eprosima
diff --git a/src/cpp/rtps/transport/TCPTransportInterface.h b/src/cpp/rtps/transport/TCPTransportInterface.h
@@ -430,18 +430,13 @@ class TCPTransportInterface : public TransportInterface
     void keep_alive();
 
     void update_network_interfaces() override;
-<<<<<<< HEAD
-=======
-
-    bool is_localhost_allowed() const override;
 
     /**
      * Method to fill local locator physical port.
      * @param locator locator to be filled.
      */
     void fill_local_physical_port(
             Locator& locator) const;
->>>>>>> b43f3a065 (TCP unique client announced local port (#4216))
 };
 
 } // namespace rtps

diff --git a/test/unittest/transport/TCPv6Tests.cpp b/test/unittest/transport/TCPv6Tests.cpp
@@ -23,14 +23,8 @@
 #include <fastrtps/transport/TCPv6TransportDescriptor.h>
 #include <fastrtps/rtps/network/NetworkFactory.h>
 #include <fastrtps/utils/Semaphore.h>
-<<<<<<< HEAD
 #include <fastrtps/utils/IPLocator.h>
-=======
-
-#include <MockReceiverResource.h>
 #include "mock/MockTCPv6Transport.h"
-#include <rtps/network/NetworkFactory.h>
->>>>>>> b43f3a065 (TCP unique client announced local port (#4216))
 #include <rtps/transport/TCPv6Transport.h>
 
 using namespace eprosima::fastrtps::rtps;