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

[18431] Fix missing includes #3508

Merged
merged 2 commits into from
May 11, 2023
Merged

[18431] Fix missing includes #3508

merged 2 commits into from
May 11, 2023

Conversation

JLBuenoLopez
Copy link
Contributor

@JLBuenoLopez JLBuenoLopez commented May 10, 2023

Description

@Mergifyio backport 2.9.x 2.6.x 2.1.x

Fixes #3494

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; the added tests pass locally
  • [N/A] Any new/modified methods have been properly documented using Doxygen.
  • Changes are ABI compatible.
  • Changes are API compatible.
  • [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.
  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
@JLBuenoLopez JLBuenoLopez added the no-test Skip CI tests if PR marked with this label label May 10, 2023
@JLBuenoLopez JLBuenoLopez added this to the v2.10.2 milestone May 10, 2023
MiguelCompany
MiguelCompany previously approved these changes May 10, 2023
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

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
@JLBuenoLopez
Copy link
Contributor Author

@richiprosima please test this

@JLBuenoLopez JLBuenoLopez added the ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. label May 11, 2023
@JLBuenoLopez JLBuenoLopez merged commit add29f4 into master May 11, 2023
@JLBuenoLopez JLBuenoLopez deleted the hotfix/3494 branch May 11, 2023 06:03
@skrede
Copy link

skrede commented May 13, 2023

Could this change be made to 2.10.x as well? In its current state, this prevents ROS2 from building on systems with GCC 13.1, as ROS2 specifically targets the 2.10.x branch.

https://github.com/ros2/ros2/blob/rolling/ros2.repos

@MiguelCompany
Copy link
Member

@skrede It is already in 2.10.x: commit add29f4

@JLBuenoLopez
Copy link
Contributor Author

@Mergifyio backport 2.9.x 2.6.x

@mergify
Copy link
Contributor

mergify bot commented May 17, 2023

backport 2.9.x 2.6.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request May 17, 2023
* Refs #18431: fix missing includes

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #18431: linters

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

---------

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
(cherry picked from commit add29f4)
mergify bot pushed a commit that referenced this pull request May 17, 2023
* Refs #18431: fix missing includes

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #18431: linters

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

---------

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
(cherry picked from commit add29f4)
@JLBuenoLopez JLBuenoLopez mentioned this pull request May 17, 2023
1 task
@indeedhat
Copy link

Could this get back ported to 2.6.4 as required by ros2 humble-release please

@JLBuenoLopez
Copy link
Contributor Author

@indeedhat, these changes have already been backported into 2.6.x in #3518. These changes will be included in the next patch release: 2.6.5. Until that moment, just build using 2.6.x branch or the commit that introduces the changes 02539b9. Fast DDS policy is not to change published releases.

@indeedhat
Copy link

that makes sense, thanks

@kistlin
Copy link
Contributor

kistlin commented Jul 8, 2023

I think the same happens in the latest release v2.11.0, when building the statistics backend.

To fix it, the following change was necessary.

diff --git a/include/fastdds/dds/core/status/StatusMask.hpp b/include/fastdds/dds/core/status/StatusMask.hpp
index c838ff369..2718869d7 100644
--- a/include/fastdds/dds/core/status/StatusMask.hpp
+++ b/include/fastdds/dds/core/status/StatusMask.hpp
@@ -24,6 +24,7 @@
 #include <fastrtps/fastrtps_dll.h>

 #include <bitset>
+#include <cstdint>
 #include <sstream>

 //!Alias of size_t(16)

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 ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Missing cstdint includes (TypeNamesGenerator.h, TransportDescriptorInterface.h)
5 participants