Skip to content

[25536] Fix some warnings in generated code (backport #593)#594

Merged
MiguelCompany merged 4 commits into
4.0.xfrom
backport/25536/4.0.x
Jul 21, 2026
Merged

[25536] Fix some warnings in generated code (backport #593)#594
MiguelCompany merged 4 commits into
4.0.xfrom
backport/25536/4.0.x

Conversation

@MiguelCompany

Copy link
Copy Markdown
Member

Description

This is a manual backport of #593. It is basically a rebase of its branch removing the commit that updates the IDL parser submodule.

@Mergifyio backport 3.3.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • 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: 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.
  • The title and description correctly express the PR's purpose.
  • 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: Miguel Company <miguelcompany@eprosima.com>
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany added this to the v4.0.7 milestone Jul 20, 2026
@github-actions github-actions Bot added the ci-pending PR which CI is running label Jul 20, 2026

@cferreiragonz cferreiragonz left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM. CI passed in eProsima/Fast-DDS#6479

@mergify

mergify Bot commented Jul 21, 2026

Copy link
Copy Markdown

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

  • Queue this pull request

@MiguelCompany
MiguelCompany merged commit 49cb136 into 4.0.x Jul 21, 2026
6 checks passed
@MiguelCompany
MiguelCompany deleted the backport/25536/4.0.x branch July 21, 2026 05:48
@MiguelCompany

Copy link
Copy Markdown
Member Author

@Mergifyio backport 3.3.x

@mergify

mergify Bot commented Jul 21, 2026

Copy link
Copy Markdown

backport 3.3.x

✅ Backports have been created

Details

Cherry-pick of 49cb136 has failed:

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

You are currently cherry-picking commit 49cb136.
  (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:   src/main/java/com/eprosima/fastdds/idl/templates/TypesCdrAuxHeaderImpl.stg

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/main/java/com/eprosima/fastcdr/idl/templates/FastCdrCommon.stg
	both modified:   src/main/java/com/eprosima/fastdds/idl/templates/eprosima.stg

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

MiguelCompany added a commit that referenced this pull request Jul 21, 2026
* Fix some warnings in generated code (#593) (#594)

* Refs #25536. Add `f` for default values in float types.

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

* Refs #25536. Remove unnecessary braces.

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

* Refs #25536. Remove more unnecessary braces.

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

* Refs #25536. Add braces for array types.

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

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 49cb136)

# Conflicts:
#	src/main/java/com/eprosima/fastcdr/idl/templates/FastCdrCommon.stg
#	src/main/java/com/eprosima/fastdds/idl/templates/eprosima.stg

* Fix 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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci-pending PR which CI is running

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants