Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[21165] Correctly initialize MatchingFailureMask constants to be used with the std::bitset API #4922

Merged
merged 3 commits into from
Jun 10, 2024

Conversation

EduPonz
Copy link

@EduPonz EduPonz commented Jun 10, 2024

Description

This PR changes the values of the MatchingFailureMask so they can be directly used through the std::bitset API. Before this PR, the following code:

EDP::MatchingFailureMask mask;
mask.set(EDP::MatchingFailureMask::different_typeinfo);

resulted in a C++ exception as follows:

"bitset::set: __position (which is 16) >= _Nb (which is 16)"

@Mergifyio backport 2.14.x 2.13.x 2.10.x 2.6.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • The code follows the style guidelines of this project.
  • Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally
  • N/A: Any new/modified methods have been properly documented using Doxygen.
  • N/A: Any new configuration API has an equivalent XML API (with the corresponding XSD extension)
  • Changes are backport compatible: they do NOT break ABI nor change library core behavior.
  • Changes are API compatible.
  • N/A: New feature has been added to the versions.md file (if applicable).
  • N/A: New feature has been documented/Current behavior is correctly described in the documentation.
  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

@EduPonz EduPonz added this to the v3.0.0 milestone Jun 10, 2024
Signed-off-by: eduponz <eduardoponz@eprosima.com>
Signed-off-by: eduponz <eduardoponz@eprosima.com>
@EduPonz EduPonz force-pushed the bugfix/matching_failure_mask branch from 8dc903e to c3c987b Compare June 10, 2024 09:50
@EduPonz EduPonz requested a review from richiware June 10, 2024 09:50
@github-actions github-actions bot added ci-pending PR which CI is running labels Jun 10, 2024
Signed-off-by: eduponz <eduardoponz@eprosima.com>
@EduPonz EduPonz requested a review from richiware June 10, 2024 09:59
@EduPonz
Copy link
Author

EduPonz commented Jun 10, 2024

@richiprosima please test discovery-server

@EduPonz EduPonz changed the title [21165] Correctly initialize MatchingFailureMask constants to be used with the std::bitset API. [21165] Correctly initialize MatchingFailureMask constants to be used with the std::bitset API Jun 10, 2024
@EduPonz
Copy link
Author

EduPonz commented Jun 10, 2024

@richiprosima please test_3 discovery-server

@EduPonz EduPonz added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Jun 10, 2024
@EduPonz EduPonz merged commit 5e1f1dd into master Jun 10, 2024
12 of 13 checks passed
@EduPonz EduPonz deleted the bugfix/matching_failure_mask branch June 10, 2024 14:20
@EduPonz
Copy link
Author

EduPonz commented Jun 10, 2024

@Mergifyio backport 2.14.x 2.13.x 2.10.x 2.6.x

Copy link
Contributor

mergify bot commented Jun 10, 2024

backport 2.14.x 2.13.x 2.10.x 2.6.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Jun 10, 2024
…the `std::bitset` API (#4922)

* Refs #21165: Add regression test

Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #21165: Init MatchingFailureMask constants as normal uints

Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #21165: Apply Ricardo's suggestions

Signed-off-by: eduponz <eduardoponz@eprosima.com>

---------

Signed-off-by: eduponz <eduardoponz@eprosima.com>
(cherry picked from commit 5e1f1dd)

# Conflicts:
#	include/fastdds/rtps/builtin/discovery/endpoint/EDP.h
mergify bot pushed a commit that referenced this pull request Jun 10, 2024
…the `std::bitset` API (#4922)

* Refs #21165: Add regression test

Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #21165: Init MatchingFailureMask constants as normal uints

Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #21165: Apply Ricardo's suggestions

Signed-off-by: eduponz <eduardoponz@eprosima.com>

---------

Signed-off-by: eduponz <eduardoponz@eprosima.com>
(cherry picked from commit 5e1f1dd)

# Conflicts:
#	include/fastdds/rtps/builtin/discovery/endpoint/EDP.h
mergify bot pushed a commit that referenced this pull request Jun 10, 2024
…the `std::bitset` API (#4922)

* Refs #21165: Add regression test

Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #21165: Init MatchingFailureMask constants as normal uints

Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #21165: Apply Ricardo's suggestions

Signed-off-by: eduponz <eduardoponz@eprosima.com>

---------

Signed-off-by: eduponz <eduardoponz@eprosima.com>
(cherry picked from commit 5e1f1dd)

# Conflicts:
#	include/fastdds/rtps/builtin/discovery/endpoint/EDP.h
#	test/unittest/rtps/discovery/EdpTests.cpp
mergify bot pushed a commit that referenced this pull request Jun 10, 2024
…the `std::bitset` API (#4922)

* Refs #21165: Add regression test

Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #21165: Init MatchingFailureMask constants as normal uints

Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #21165: Apply Ricardo's suggestions

Signed-off-by: eduponz <eduardoponz@eprosima.com>

---------

Signed-off-by: eduponz <eduardoponz@eprosima.com>
(cherry picked from commit 5e1f1dd)

# Conflicts:
#	include/fastdds/rtps/builtin/discovery/endpoint/EDP.h
#	test/unittest/rtps/discovery/EdpTests.cpp
EduPonz added a commit that referenced this pull request Jun 11, 2024
…the `std::bitset` API (#4922)

* Refs #21165: Add regression test

Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #21165: Init MatchingFailureMask constants as normal uints

Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #21165: Apply Ricardo's suggestions

Signed-off-by: eduponz <eduardoponz@eprosima.com>

---------

Signed-off-by: eduponz <eduardoponz@eprosima.com>
(cherry picked from commit 5e1f1dd)
EduPonz added a commit that referenced this pull request Jun 11, 2024
…the `std::bitset` API (#4922)

* Refs #21165: Add regression test

Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #21165: Init MatchingFailureMask constants as normal uints

Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #21165: Apply Ricardo's suggestions

Signed-off-by: eduponz <eduardoponz@eprosima.com>

---------

Signed-off-by: eduponz <eduardoponz@eprosima.com>
(cherry picked from commit 5e1f1dd)
EduPonz added a commit that referenced this pull request Jun 11, 2024
…the `std::bitset` API (#4922)

* Refs #21165: Add regression test

Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #21165: Init MatchingFailureMask constants as normal uints

Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #21165: Apply Ricardo's suggestions

Signed-off-by: eduponz <eduardoponz@eprosima.com>

---------

Signed-off-by: eduponz <eduardoponz@eprosima.com>
(cherry picked from commit 5e1f1dd)
EduPonz added a commit that referenced this pull request Jun 11, 2024
…the `std::bitset` API (#4922) (#4925)

* Refs #21165: Add regression test

Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #21165: Init MatchingFailureMask constants as normal uints

Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #21165: Apply Ricardo's suggestions

Signed-off-by: eduponz <eduardoponz@eprosima.com>

---------

Signed-off-by: eduponz <eduardoponz@eprosima.com>
(cherry picked from commit 5e1f1dd)

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
EduPonz added a commit that referenced this pull request Jun 17, 2024
…the `std::bitset` API (#4922)

* Refs #21165: Add regression test

Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #21165: Init MatchingFailureMask constants as normal uints

Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #21165: Apply Ricardo's suggestions

Signed-off-by: eduponz <eduardoponz@eprosima.com>

---------

Signed-off-by: eduponz <eduardoponz@eprosima.com>
(cherry picked from commit 5e1f1dd)

# Conflicts:
#	include/fastdds/rtps/builtin/discovery/endpoint/EDP.h
#	test/unittest/rtps/discovery/EdpTests.cpp
EduPonz added a commit that referenced this pull request Jun 18, 2024
…the `std::bitset` API (#4922) (#4928)

* Correctly initialize `MatchingFailureMask` constants to be used with the `std::bitset` API (#4922)

* Refs #21165: Add regression test

Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #21165: Init MatchingFailureMask constants as normal uints

Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #21165: Apply Ricardo's suggestions

Signed-off-by: eduponz <eduardoponz@eprosima.com>

---------

Signed-off-by: eduponz <eduardoponz@eprosima.com>
(cherry picked from commit 5e1f1dd)

# Conflicts:
#	include/fastdds/rtps/builtin/discovery/endpoint/EDP.h
#	test/unittest/rtps/discovery/EdpTests.cpp

* Solve conflicts

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
Co-authored-by: Mario Dominguez <mariodominguez@eprosima.com>
EduPonz added a commit that referenced this pull request Jun 18, 2024
…the `std::bitset` API (#4922) (#4926)

* Refs #21165: Add regression test

Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #21165: Init MatchingFailureMask constants as normal uints

Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #21165: Apply Ricardo's suggestions

Signed-off-by: eduponz <eduardoponz@eprosima.com>

---------

Signed-off-by: eduponz <eduardoponz@eprosima.com>
(cherry picked from commit 5e1f1dd)

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
MiguelCompany pushed a commit that referenced this pull request Jun 19, 2024
…the `std::bitset` API (#4922) (#4927)

* Refs #21165: Add regression test

Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #21165: Init MatchingFailureMask constants as normal uints

Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #21165: Apply Ricardo's suggestions

Signed-off-by: eduponz <eduardoponz@eprosima.com>

---------

Signed-off-by: eduponz <eduardoponz@eprosima.com>
(cherry picked from commit 5e1f1dd)

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants