Skip to content

[15997] Construct with decltype when inserting to map on FlowControllerFactory#3034

Merged
MiguelCompany merged 1 commit intomasterfrom
hotfix/13720
Nov 4, 2022
Merged

[15997] Construct with decltype when inserting to map on FlowControllerFactory#3034
MiguelCompany merged 1 commit intomasterfrom
hotfix/13720

Conversation

@MiguelCompany
Copy link
Copy Markdown
Member

@MiguelCompany MiguelCompany commented Oct 24, 2022 •
edited by EduPonz
Loading

Description

This should fix building with old compilers that cannot deduce they should use the move constructor of unique_ptr.

@Mergifyio backport 2.7.x 2.6.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • The code follows the style guidelines of this project.
  • N/A Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added.
  • N/A Any new/modified methods have been properly documented using Doxygen.
  • Fast DDS test suite has been run locally.
  • Changes are ABI compatible.
  • Changes are API compatible.
  • N/A Documentation builds and tests pass locally.
  • N/A New feature has been added to the versions.md file (if applicable).
  • N/A New feature has been documented/Current behavior is correctly described in the documentation.

Reviewer Checklist

  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

@MiguelCompany MiguelCompany added no-test Skip CI tests if PR marked with this label no-aarch Skip build & test for aarch64 labels Oct 24, 2022
@MiguelCompany
Copy link
Copy Markdown
Member Author

MiguelCompany commented Oct 24, 2022

@richiprosima Please test this

@MiguelCompany
Refs 13720. Construct with decltype when inserting to map on FlowCont…
ecbd62a 
…rollerFactory.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany MiguelCompany changed the title Use std::move when inserting unique_ptr on FlowControllerFactory Construct with decltype when inserting to map on FlowControllerFactory Oct 24, 2022
@MiguelCompany
Copy link
Copy Markdown
Member Author

MiguelCompany commented Oct 24, 2022

@richiprosima Please test this

@MiguelCompany MiguelCompany changed the title Construct with decltype when inserting to map on FlowControllerFactory [15997] Construct with decltype when inserting to map on FlowControllerFactory Oct 24, 2022
@MiguelCompany MiguelCompany mentioned this pull request Nov 3, 2022
Closed
@jimlloyd
Copy link
Copy Markdown

jimlloyd commented Nov 3, 2022

This fixes the problem we have been having with gcc 7.2.

@MiguelCompany MiguelCompany merged commit f3f994e into master Nov 4, 2022
@MiguelCompany MiguelCompany deleted the hotfix/13720 branch November 4, 2022 06:22
@MiguelCompany
Copy link
Copy Markdown
Member Author

MiguelCompany commented Nov 4, 2022

@Mergifyio backport 2.7.x 2.6.x

mergify bot pushed a commit that referenced this pull request Nov 4, 2022
@MiguelCompany @mergify
Construct with decltype when inserting to map on FlowControllerFactory (
a12e939 
#3034)

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

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

# Conflicts:
#	src/cpp/rtps/flowcontrol/FlowControllerFactory.cpp
@mergify mergify bot mentioned this pull request Nov 4, 2022
Merged
mergify bot pushed a commit that referenced this pull request Nov 4, 2022
@MiguelCompany @mergify
Construct with decltype when inserting to map on FlowControllerFactory (
cf8331c 
#3034)

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

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

# Conflicts:
#	src/cpp/rtps/flowcontrol/FlowControllerFactory.cpp
@mergify mergify bot mentioned this pull request Nov 4, 2022
Merged
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Nov 4, 2022

backport 2.7.x 2.6.x

✅ Backports have been created

Details

MiguelCompany added a commit that referenced this pull request Nov 4, 2022
@mergify @MiguelCompany
Construct with decltype when inserting to map on FlowControllerFactory (
207774d 
#3064)

* Construct with decltype when inserting to map on FlowControllerFactory (#3034)

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

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

# Conflicts:
#	src/cpp/rtps/flowcontrol/FlowControllerFactory.cpp

* Fixed conflicts

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

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
MiguelCompany added a commit that referenced this pull request Nov 4, 2022
@mergify @MiguelCompany
Construct with decltype when inserting to map on FlowControllerFactory (
45ac4d4 
#3063)

* Construct with decltype when inserting to map on FlowControllerFactory (#3034)

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

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

# Conflicts:
#	src/cpp/rtps/flowcontrol/FlowControllerFactory.cpp

* Fixed conflict

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

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

Reviewers

@richiware richiware Awaiting requested review from richiware

1 more reviewer

@EduPonz EduPonz EduPonz approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

no-aarch Skip build & test for aarch64 no-test Skip CI tests if PR marked with this label

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@MiguelCompany @jimlloyd @EduPonz