Skip to content

Commit

Permalink
Solve conflicts
Browse files Browse the repository at this point in the history
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
  • Loading branch information
Mario-DL committed Jun 11, 2024
1 parent a57538b commit 2b11a87
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 14 deletions.
7 changes: 0 additions & 7 deletions include/fastdds/rtps/builtin/discovery/endpoint/EDP.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
};

/**
Expand Down
7 changes: 0 additions & 7 deletions test/unittest/rtps/discovery/EdpTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -399,8 +399,6 @@ TEST_F(EdpTests, CheckPositiveAckCompatibility)
}
}

<<<<<<< HEAD
=======
TEST_F(EdpTests, CheckDataRepresentationCompatibility)
{
using DataRepresentationQosVector = std::vector<fastdds::dds::DataRepresentationId>;
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 2b11a87

Please sign in to comment.