From 2b11a875812610540480f2dee4b9a9ec3c2f29d3 Mon Sep 17 00:00:00 2001 From: Mario Dominguez Date: Tue, 11 Jun 2024 08:31:13 +0200 Subject: [PATCH] Solve conflicts Signed-off-by: Mario Dominguez --- include/fastdds/rtps/builtin/discovery/endpoint/EDP.h | 7 ------- test/unittest/rtps/discovery/EdpTests.cpp | 7 ------- 2 files changed, 14 deletions(-) diff --git a/include/fastdds/rtps/builtin/discovery/endpoint/EDP.h b/include/fastdds/rtps/builtin/discovery/endpoint/EDP.h index 4d8a53a990e..4a1174a15b7 100644 --- a/include/fastdds/rtps/builtin/discovery/endpoint/EDP.h +++ b/include/fastdds/rtps/builtin/discovery/endpoint/EDP.h @@ -80,14 +80,7 @@ class EDP static const uint32_t incompatible_qos = 2u; //! Bit index for matching failing due to inconsistent partitions -<<<<<<< HEAD:include/fastdds/rtps/builtin/discovery/endpoint/EDP.h - static const uint32_t partitions = (0x00000001 << 3u); -======= static const uint32_t partitions = 3u; - - //! Bit index for matching failing due to incompatible TypeInformation - static const uint32_t different_typeinfo = 4u; ->>>>>>> 5e1f1dd22 (Correctly initialize `MatchingFailureMask` constants to be used with the `std::bitset` API (#4922)):src/cpp/rtps/builtin/discovery/endpoint/EDP.h }; /** diff --git a/test/unittest/rtps/discovery/EdpTests.cpp b/test/unittest/rtps/discovery/EdpTests.cpp index 9ff84c83667..6a94e480f97 100644 --- a/test/unittest/rtps/discovery/EdpTests.cpp +++ b/test/unittest/rtps/discovery/EdpTests.cpp @@ -399,8 +399,6 @@ TEST_F(EdpTests, CheckPositiveAckCompatibility) } } -<<<<<<< HEAD -======= TEST_F(EdpTests, CheckDataRepresentationCompatibility) { using DataRepresentationQosVector = std::vector; @@ -461,13 +459,8 @@ TEST(MatchingFailureMask, matching_failure_mask_overflow) mask.set(EDP::MatchingFailureMask::partitions); EXPECT_TRUE(mask.test(EDP::MatchingFailureMask::partitions)); - - mask.set(EDP::MatchingFailureMask::different_typeinfo); - EXPECT_TRUE(mask.test(EDP::MatchingFailureMask::different_typeinfo)); } - ->>>>>>> 5e1f1dd22 (Correctly initialize `MatchingFailureMask` constants to be used with the `std::bitset` API (#4922)) } // namespace rtps } // namespace fastrtps } // namespace eprosima