-
Notifications
You must be signed in to change notification settings - Fork 793
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
[19887] Add missing thread include (backport #4045) #4065
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 tasks
@EduPonz Would you mind fixing the conflicts here? |
* Refs #19887: Add missing thread include Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #19887. Update `ReturnCode_t` comparison operators. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #19887: Uncrustify Signed-off-by: EduPonz <eduardoponz@eprosima.com> --------- Signed-off-by: EduPonz <eduardoponz@eprosima.com> Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> Co-authored-by: Miguel Company <MiguelCompany@eprosima.com> (cherry picked from commit 6390715) # Conflicts: # test/blackbox/common/BlackboxTestsPubSubHistory.cpp # test/blackbox/common/DDSBlackboxTestsListeners.cpp # test/blackbox/common/DDSBlackboxTestsOwnershipQos.cpp # test/unittest/dds/publisher/DataWriterTests.cpp # test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnAsyncTests.cpp # test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnLimitedAsyncTests.cpp # test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnPureSyncTests.cpp # test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnSyncTests.cpp # test/unittest/rtps/flowcontrol/FlowControllerSchedulersTests.cpp # test/unittest/statistics/rtps/RTPSStatisticsTests.cpp
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
EduPonz
force-pushed
the
mergify/bp/2.6.x/pr-4045
branch
from
December 1, 2023 07:16
37367bb
to
165c0b1
Compare
EduPonz
added
ci-pending
PR which CI is running
and removed
conflicts
Backport PR wich git cherry pick failed
labels
Dec 1, 2023
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
EduPonz
force-pushed
the
mergify/bp/2.6.x/pr-4045
branch
from
December 1, 2023 07:40
223e8cd
to
1c5f346
Compare
MiguelCompany
approved these changes
Dec 1, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM with green build
@richiprosima Please test this |
@richiprosima Please test mac |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatic backport of pull request #4045 done by Mergify.
Cherry-pick of 6390715 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refresh
will re-evaluate the rules@Mergifyio rebase
will rebase this PR on its base branch@Mergifyio update
will merge the base branch into this PR@Mergifyio backport <destination>
will backport this PR on<destination>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com