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

Fix warnings and segfaults on Win32 builds <2.2.x> #1986

Merged
merged 2 commits into from
May 26, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 24, 2021

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

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

You are currently cherry-picking commit d5f3559fb.
  (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/fastdds/dds/core/policy/ParameterTypes.hpp
	modified:   src/cpp/rtps/DataSharing/DataSharingListener.cpp
	modified:   src/cpp/rtps/DataSharing/DataSharingNotification.hpp
	modified:   src/cpp/rtps/DataSharing/DataSharingPayloadPool.hpp
	modified:   src/cpp/rtps/builtin/data/ParticipantProxyData.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/builtin/discovery/participant/PDP.cpp

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/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.io/

* Refs 11606. Fixed alignment warnings.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 11606. Added ParameterPropertyList_t::push_back method receiving 2 const string refs.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 11606. Using new method on PDP and ParticipantProxyData.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 11606. Improve thread safety on DataSharingListener.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit d5f3559)

# Conflicts:
#	src/cpp/rtps/builtin/discovery/participant/PDP.cpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label May 24, 2021
@MiguelCompany MiguelCompany changed the title Fix warnings and segfaults on Win32 builds (backport #1982) Fix warnings and segfaults on Win32 builds <2.2.x> May 24, 2021
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany MiguelCompany merged commit c961d85 into 2.2.x May 26, 2021
@MiguelCompany MiguelCompany deleted the mergify/bp/2.2.x/pr-1982 branch May 26, 2021 06:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts Backport PR wich git cherry pick failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant