Solve conflicts

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
eProsima · Jun 4, 2024 · 6822b66 · 6822b66
1 parent 958767d
commit 6822b66
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 29 deletions.
diff --git a/include/fastdds/rtps/writer/LivelinessManager.h b/include/fastdds/rtps/writer/LivelinessManager.h
@@ -90,14 +90,9 @@ class LivelinessManager
      */
     bool remove_writer(
             GUID_t guid,
-<<<<<<< HEAD:include/fastdds/rtps/writer/LivelinessManager.h
-            LivelinessQosPolicyKind kind,
-            Duration_t lease_duration);
-=======
             fastdds::dds::LivelinessQosPolicyKind kind,
             Duration_t lease_duration,
             LivelinessData::WriterStatus& writer_liveliness_status);
->>>>>>> df909438f (Correctly call `on_liveliness_changed` when there are multiple readers on the same topic (#4822)):src/cpp/rtps/writer/LivelinessManager.hpp
 
     /**
      * @brief Asserts liveliness of a writer in the set

diff --git a/src/cpp/rtps/writer/LivelinessManager.cpp b/src/cpp/rtps/writer/LivelinessManager.cpp
@@ -91,14 +91,9 @@ bool LivelinessManager::add_writer(
 
 bool LivelinessManager::remove_writer(
         GUID_t guid,
-<<<<<<< HEAD
-        LivelinessQosPolicyKind kind,
-        Duration_t lease_duration)
-=======
         fastdds::dds::LivelinessQosPolicyKind kind,
         Duration_t lease_duration,
         LivelinessData::WriterStatus& writer_status)
->>>>>>> df909438f (Correctly call `on_liveliness_changed` when there are multiple readers on the same topic (#4822))
 {
     bool removed = false;
 

diff --git a/test/unittest/rtps/writer/LivelinessManagerTests.cpp b/test/unittest/rtps/writer/LivelinessManagerTests.cpp
@@ -154,19 +154,6 @@ TEST_F(LivelinessManagerTests, WriterCannotBeRemovedTwice)
     GUID_t guid(guidP, 0);
     LivelinessData::WriterStatus writer_status;
 
-<<<<<<< HEAD
-    EXPECT_EQ(liveliness_manager.add_writer(guid, AUTOMATIC_LIVELINESS_QOS, Duration_t(1)), true);
-    EXPECT_EQ(liveliness_manager.remove_writer(guid, AUTOMATIC_LIVELINESS_QOS, Duration_t(1)), true);
-    EXPECT_EQ(liveliness_manager.remove_writer(guid, AUTOMATIC_LIVELINESS_QOS, Duration_t(1)), false);
-
-    EXPECT_EQ(liveliness_manager.add_writer(guid, MANUAL_BY_PARTICIPANT_LIVELINESS_QOS, Duration_t(1)), true);
-    EXPECT_EQ(liveliness_manager.remove_writer(guid, MANUAL_BY_PARTICIPANT_LIVELINESS_QOS, Duration_t(1)), true);
-    EXPECT_EQ(liveliness_manager.remove_writer(guid, MANUAL_BY_PARTICIPANT_LIVELINESS_QOS, Duration_t(1)), false);
-
-    EXPECT_EQ(liveliness_manager.add_writer(guid, MANUAL_BY_TOPIC_LIVELINESS_QOS, Duration_t(1)), true);
-    EXPECT_EQ(liveliness_manager.remove_writer(guid, MANUAL_BY_TOPIC_LIVELINESS_QOS, Duration_t(1)), true);
-    EXPECT_EQ(liveliness_manager.remove_writer(guid, MANUAL_BY_TOPIC_LIVELINESS_QOS, Duration_t(1)), false);
-=======
     EXPECT_EQ(liveliness_manager.add_writer(guid, fastdds::dds::AUTOMATIC_LIVELINESS_QOS, Duration_t(1)), true);
     EXPECT_EQ(liveliness_manager.remove_writer(guid, fastdds::dds::AUTOMATIC_LIVELINESS_QOS, Duration_t(1),
             writer_status), true);
@@ -187,7 +174,6 @@ TEST_F(LivelinessManagerTests, WriterCannotBeRemovedTwice)
     EXPECT_EQ(liveliness_manager.remove_writer(guid, fastdds::dds::MANUAL_BY_TOPIC_LIVELINESS_QOS, Duration_t(1),
             writer_status),
             false);
->>>>>>> df909438f (Correctly call `on_liveliness_changed` when there are multiple readers on the same topic (#4822))
 }
 
 //! Tests that the assert_liveliness() method that takes liveliness kind as argument sets the alive state and time
@@ -508,14 +494,9 @@ TEST_F(LivelinessManagerTests, TimerOwnerRemoved)
     liveliness_manager.add_writer(GUID_t(guidP, 1), AUTOMATIC_LIVELINESS_QOS, Duration_t(0.5));
     liveliness_manager.add_writer(GUID_t(guidP, 2), AUTOMATIC_LIVELINESS_QOS, Duration_t(1));
 
-<<<<<<< HEAD
-    liveliness_manager.assert_liveliness(GUID_t(guidP, 1), AUTOMATIC_LIVELINESS_QOS, Duration_t(0.5));
-    liveliness_manager.remove_writer(GUID_t(guidP, 1), AUTOMATIC_LIVELINESS_QOS, Duration_t(0.5));
-=======
     liveliness_manager.assert_liveliness(GUID_t(guidP, 1), fastdds::dds::AUTOMATIC_LIVELINESS_QOS, Duration_t(0.5));
     liveliness_manager.remove_writer(GUID_t(guidP, 1), fastdds::dds::AUTOMATIC_LIVELINESS_QOS, Duration_t(
                 0.5), writer_status);
->>>>>>> df909438f (Correctly call `on_liveliness_changed` when there are multiple readers on the same topic (#4822))
 
     wait_liveliness_lost(1u);
     EXPECT_EQ(writer_losing_liveliness, GUID_t(guidP, 2));