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

Fixed build without security after #938 #979

Merged
merged 1 commit into from
Jan 27, 2020
Merged

Conversation

MiguelCompany
Copy link
Member

@MiguelCompany MiguelCompany commented Jan 27, 2020

This fixes a build error introduced on #938 when building without security.

Skipping tests, as they are always run with security enabled.

@MiguelCompany MiguelCompany added the no-test Skip CI tests if PR marked with this label label Jan 27, 2020
Copy link
Contributor

@IkerLuengo IkerLuengo 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 47214e9 into 1.9.x Jan 27, 2020
@MiguelCompany MiguelCompany deleted the hotfix/938-no-security branch January 27, 2020 10:40
MiguelCompany pushed a commit that referenced this pull request Feb 28, 2020
This is a port of #938 and #979 and 3778a97 from 1.9.X

* Refs #7116. Separating RTPSMessageGroup_t into a private header.

* Refs #7116. Passing send buffers management responsibility to RTPSParticipantImpl.

* Refs #7116. RAII on RTPSMessageGroup_t.

* Refs #7116. Protecting access to buffer pool.

* Refs #7116. Preallocating one buffer per expected thread.

* Refs #7116. Protecting access to buffer pool with specific mutex.

* Refs #7116. New SendBuffersManager class.

* Refs #7116. Allowing wrapping buffer on RTPSMessageGroup_t.

* Refs #7116. Using a single allocation for all initially allocated buffers.

* Refs #7116. Adding assertion.

* Refs #7116. Fixed alignment.

* Refs #7116. Correct calculation of raw buffer size.

* Refs #7116. Early return on security initialization failure.

* Refs #7116. Making send buffers allocation configurable.

* Refs #7116. Adding XML configuration for send_buffers allocation.

* Refs #7116. Adding participant allocation attributes to XML parser unit test.

* Refs #7165. Fixed warnings.

* Refs #7165. Fixed leak.

* Refs #7165. Return send buffer even if an exception is thrown.

* Refs #7165. Correctly return send buffer.

* Fixed build without security.
MiguelCompany added a commit that referenced this pull request Feb 28, 2020
* Refs #7166 RTPSMessageGroup_t preallocation

This is a port of #938 and #979 and 3778a97 from 1.9.X

* Refs #7116. Separating RTPSMessageGroup_t into a private header.

* Refs #7116. Passing send buffers management responsibility to RTPSParticipantImpl.

* Refs #7116. RAII on RTPSMessageGroup_t.

* Refs #7116. Protecting access to buffer pool.

* Refs #7116. Preallocating one buffer per expected thread.

* Refs #7116. Protecting access to buffer pool with specific mutex.

* Refs #7116. New SendBuffersManager class.

* Refs #7116. Allowing wrapping buffer on RTPSMessageGroup_t.

* Refs #7116. Using a single allocation for all initially allocated buffers.

* Refs #7116. Adding assertion.

* Refs #7116. Fixed alignment.

* Refs #7116. Correct calculation of raw buffer size.

* Refs #7116. Early return on security initialization failure.

* Refs #7116. Making send buffers allocation configurable.

* Refs #7116. Adding XML configuration for send_buffers allocation.

* Refs #7116. Adding participant allocation attributes to XML parser unit test.

* Refs #7165. Fixed warnings.

* Refs #7165. Fixed leak.

* Refs #7165. Return send buffer even if an exception is thrown.

* Refs #7165. Correctly return send buffer.

* Fixed build without security.

* Refs #7166. Apply suggestions from code review

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
no-test Skip CI tests if PR marked with this label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants