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

[19887] Add missing thread include (backport #4045) #4065

Merged
merged 3 commits into from
Dec 1, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 29, 2023

This is an automatic backport of pull request #4045 done by Mergify.
Cherry-pick of 6390715 has failed:

On branch mergify/bp/2.6.x/pr-4045
Your branch is up to date with 'origin/2.6.x'.

You are currently cherry-picking commit 6390715a1.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   include/fastrtps/types/TypesBase.h
	modified:   test/blackbox/common/BlackboxTestsDeadlineQos.cpp
	modified:   test/blackbox/common/BlackboxTestsPubSubFlowControllers.cpp
	modified:   test/blackbox/common/BlackboxTestsPubSubFragments.cpp
	modified:   test/blackbox/common/BlackboxTestsReliability.cpp
	modified:   test/blackbox/common/DDSBlackboxTestsContentFilter.cpp
	modified:   test/blackbox/common/DDSBlackboxTestsDataReader.cpp
	modified:   test/blackbox/common/DDSBlackboxTestsDataSharing.cpp
	modified:   test/blackbox/common/DDSBlackboxTestsPersistence.cpp
	modified:   test/performance/video/VideoTestPublisher.cpp
	modified:   test/performance/video/VideoTestSubscriber.cpp
	modified:   test/performance/video/main_VideoTest.cpp
	modified:   test/profiling/MemoryTestPublisher.cpp
	modified:   test/profiling/MemoryTestSubscriber.cpp
	modified:   test/profiling/allocations/AllocTestPublisher.cpp
	modified:   test/profiling/allocations/AllocTestSubscriber.cpp
	modified:   test/profiling/main_MemoryTest.cpp
	modified:   test/unittest/dds/core/condition/ConditionTests.cpp
	modified:   test/unittest/dds/core/entity/EntityTests.cpp
	modified:   test/unittest/logging/log_macros/LogMacros.hpp
	modified:   test/unittest/security/logging/LoggingPluginTests.hpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   test/blackbox/common/BlackboxTestsPubSubHistory.cpp
	both modified:   test/blackbox/common/DDSBlackboxTestsListeners.cpp
	deleted by us:   test/blackbox/common/DDSBlackboxTestsOwnershipQos.cpp
	both modified:   test/unittest/dds/publisher/DataWriterTests.cpp
	both modified:   test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnAsyncTests.cpp
	both modified:   test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnLimitedAsyncTests.cpp
	both modified:   test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnPureSyncTests.cpp
	both modified:   test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnSyncTests.cpp
	both modified:   test/unittest/rtps/flowcontrol/FlowControllerSchedulersTests.cpp
	both modified:   test/unittest/statistics/rtps/RTPSStatisticsTests.cpp

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> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Nov 29, 2023
@mergify mergify bot mentioned this pull request Nov 29, 2023
8 tasks
@JesusPoderoso JesusPoderoso added this to the v2.6.7 milestone Nov 29, 2023
@MiguelCompany
Copy link
Member

@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 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>
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 build

@MiguelCompany MiguelCompany added the no-test Skip CI tests if PR marked with this label label Dec 1, 2023
@MiguelCompany
Copy link
Member

@richiprosima Please test this

@MiguelCompany
Copy link
Member

@richiprosima Please test mac

@MiguelCompany MiguelCompany merged commit 12432cc into 2.6.x Dec 1, 2023
8 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.6.x/pr-4045 branch December 1, 2023 15:29
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 no-test Skip CI tests if PR marked with this label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants