Skip to content

[25469] Improve generated header guards (backport #587)#588

Merged
MiguelCompany merged 2 commits into
4.0.xfrom
mergify/bp/4.0.x/pr-587
Jul 16, 2026
Merged

[25469] Improve generated header guards (backport #587)#588
MiguelCompany merged 2 commits into
4.0.xfrom
mergify/bp/4.0.x/pr-587

Conversation

@mergify

@mergify mergify Bot commented Jul 1, 2026

Copy link
Copy Markdown

Description

  • Header guards should not include characters other than capital letters, numbers, and underscores.
  • IDL files with the same name in different folders should have different header guards
  • For the use case of separate invocations of fastddsgen from different folders, where two different IDL files could have the same relative path, take into account the namespace of the last declared structure, or the namespace of the last declaration.

@Mergifyio backport 4.0.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • 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.

This is an automatic backport of pull request #587 done by [Mergify](https://mergify.com).

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

# Conflicts:
#	src/main/java/com/eprosima/fastdds/idl/grammar/Context.java
@mergify

mergify Bot commented Jul 1, 2026

Copy link
Copy Markdown
Author

Cherry-pick of 72f89a0 has failed:

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

You are currently cherry-picking commit 72f89a0.
  (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/test/java/com/eprosima/fastdds/FastDDSGenTest.java

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

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

@mergify mergify Bot added the conflicts label Jul 1, 2026
@mergify mergify Bot mentioned this pull request Jul 1, 2026
8 tasks
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany
MiguelCompany self-requested a review July 1, 2026 10:45
@github-actions github-actions Bot added the ci-pending PR which CI is running label Jul 1, 2026
@MiguelCompany MiguelCompany added this to the v4.0.7 milestone Jul 1, 2026
@mergify

mergify Bot commented Jul 1, 2026

Copy link
Copy Markdown
Author

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

  • Queue this pull request

@MiguelCompany
MiguelCompany merged commit 3cfcad8 into 4.0.x Jul 16, 2026
6 checks passed
@MiguelCompany
MiguelCompany deleted the mergify/bp/4.0.x/pr-587 branch July 16, 2026 07:33
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.

1 participant