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 #1982

Merged
merged 4 commits into from
May 21, 2021
Merged

Conversation

MiguelCompany
Copy link
Member

@MiguelCompany MiguelCompany commented May 20, 2021

Tests run locally for Win32

@MiguelCompany MiguelCompany requested a review from IkerLuengo May 20, 2021 09:13
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
… 2 const string refs.

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

@JLBuenoLopez JLBuenoLopez left a comment

Choose a reason for hiding this comment

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

LGTM

@MiguelCompany MiguelCompany merged commit d5f3559 into master May 21, 2021
@MiguelCompany MiguelCompany deleted the bugfix/11606 branch May 21, 2021 10:26
@MiguelCompany
Copy link
Member Author

@Mergifyio backport 2.2.x

mergify bot pushed a commit that referenced this pull request May 24, 2021
* 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
Copy link
Contributor

mergify bot commented May 24, 2021

Command backport 2.2.x: success

Backports have been created

MiguelCompany added a commit that referenced this pull request May 26, 2021
* Fix warnings and segfaults on Win32 builds (#1982)

* 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

* Fixed rebase conflicts

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

Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants