Skip to content

[24255] Consider external members as not plain#562

Merged
MiguelCompany merged 1 commit intomasterfrom
bugfix/24255
Mar 10, 2026
Merged

[24255] Consider external members as not plain#562
MiguelCompany merged 1 commit intomasterfrom
bugfix/24255

Conversation

@MiguelCompany
Copy link
Member

@MiguelCompany MiguelCompany commented Mar 9, 2026

Description

This ensures that a type with an external member is never considered plain.

Depends on:

@Mergifyio backport 4.2.x 4.0.x 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.
    • We would need to update the backports, since they imply updating IDL parser to their corresponding backport.

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.

@MiguelCompany MiguelCompany added this to the v4.3.1 milestone Mar 9, 2026
@MiguelCompany MiguelCompany marked this pull request as draft March 9, 2026 15:50
@MiguelCompany MiguelCompany marked this pull request as ready for review March 9, 2026 15:53
@github-actions github-actions bot added the ci-pending PR which CI is running label Mar 9, 2026
jepemi
jepemi previously approved these changes Mar 10, 2026
@MiguelCompany
Copy link
Member Author

@Mergifyio rebase

@mergify
Copy link

mergify bot commented Mar 10, 2026

rebase

🛑 The pull request rule doesn't match anymore

Details

This action has been cancelled.

@MiguelCompany MiguelCompany requested review from richiprosima and removed request for richiprosima March 10, 2026 10:00
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany merged commit 775c66b into master Mar 10, 2026
5 checks passed
@MiguelCompany MiguelCompany deleted the bugfix/24255 branch March 10, 2026 13:46
@MiguelCompany
Copy link
Member Author

@Mergifyio backport 4.2.x 4.0.x 3.3.x

@mergify
Copy link

mergify bot commented Mar 10, 2026

backport 4.2.x 4.0.x 3.3.x

❌ No backport have been created

Details
  • Backport to branch 4.2.x failed

Git reported the following error:

Failed to merge submodule thirdparty/idl-parser (not checked out)
CONFLICT (submodule): Merge conflict in thirdparty/idl-parser
Recursive merging with submodules currently only supports trivial cases.
Please manually handle the merging of each conflicted submodule.
This can be accomplished with the following steps:
 - come back to superproject and run:

      git add thirdparty/idl-parser

   to record the above merge or update
 - resolve any other conflicts in the superproject
 - commit the resulting index in the superproject
error: could not apply 775c66b... Consider external members as not plain (#562)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

  • Backport to branch 4.0.x failed

Git reported the following error:

Failed to merge submodule thirdparty/idl-parser (not checked out)
CONFLICT (submodule): Merge conflict in thirdparty/idl-parser
Recursive merging with submodules currently only supports trivial cases.
Please manually handle the merging of each conflicted submodule.
This can be accomplished with the following steps:
 - come back to superproject and run:

      git add thirdparty/idl-parser

   to record the above merge or update
 - resolve any other conflicts in the superproject
 - commit the resulting index in the superproject
error: could not apply 775c66b... Consider external members as not plain (#562)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

  • Backport to branch 3.3.x failed

Git reported the following error:

Failed to merge submodule thirdparty/idl-parser (not checked out)
CONFLICT (submodule): Merge conflict in thirdparty/idl-parser
Recursive merging with submodules currently only supports trivial cases.
Please manually handle the merging of each conflicted submodule.
This can be accomplished with the following steps:
 - come back to superproject and run:

      git add thirdparty/idl-parser

   to record the above merge or update
 - resolve any other conflicts in the superproject
 - commit the resulting index in the superproject
error: could not apply 775c66b... Consider external members as not plain (#562)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

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