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

[19642] Use STL implementation of Timed/RecursiveTimedMutex when MSVC >= 19.36 #3904

Merged
merged 2 commits into from
Oct 9, 2023

Conversation

Mario-DL
Copy link
Member

@Mario-DL Mario-DL commented Oct 5, 2023

Description

This PR changes to the the STL implementation the Timed/RecursiveTimedMutex in MSVC >= 19.36.

Note: Tested compilation against 19.37.32824.0

@Mergifyio backport 2.11.x 2.10.x 2.6.x

Fixes #3783
Fixes #3829

Contributor Checklist

  • Commit messages follow the project guidelines.
  • The code follows the style guidelines of this project.
    N/A 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.
  • Changes are ABI compatible.
  • 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.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

…SVC >= 19.36

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL Mario-DL added needs-review PR that is ready to be reviewed ci-pending PR which CI is running labels Oct 5, 2023
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL
Copy link
Member Author

Mario-DL commented Oct 5, 2023

@richiprosima please test mac

Copy link
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with green CI

@JLBuenoLopez JLBuenoLopez added this to the v2.12.1 milestone Oct 6, 2023
@MiguelCompany
Copy link
Member

@richiprosima Please test this

@jimwang118
Copy link

I am the maintainer of vcpkg and I tested the fix locally and the compiled code after the fix is correct.

@Mario-DL
Copy link
Member Author

Mario-DL commented Oct 9, 2023

@richiprosima please test mac

1 similar comment
@Mario-DL
Copy link
Member Author

Mario-DL commented Oct 9, 2023

@richiprosima please test mac

@MiguelCompany
Copy link
Member

@Mergifyio backport 2.11.x 2.10.x 2.6.x

@mergify
Copy link
Contributor

mergify bot commented Oct 9, 2023

@MiguelCompany MiguelCompany merged commit e2137cb into master Oct 9, 2023
10 of 14 checks passed
@MiguelCompany MiguelCompany deleted the fix/timed_mutex_on_modern_msvc branch October 9, 2023 19:11
mergify bot pushed a commit that referenced this pull request Oct 9, 2023
#3904)

* Refs #19642: Use STL implementation of Timed/RecursiveTimedMutex in MSVC >= 19.36

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

* Refs #19642: Linter

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

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit e2137cb)
mergify bot pushed a commit that referenced this pull request Oct 9, 2023
#3904)

* Refs #19642: Use STL implementation of Timed/RecursiveTimedMutex in MSVC >= 19.36

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

* Refs #19642: Linter

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

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit e2137cb)
mergify bot pushed a commit that referenced this pull request Oct 9, 2023
#3904)

* Refs #19642: Use STL implementation of Timed/RecursiveTimedMutex in MSVC >= 19.36

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

* Refs #19642: Linter

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

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit e2137cb)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-pending PR which CI is running needs-review PR that is ready to be reviewed
Projects
None yet
4 participants