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

[22657] Fix log category name macro collision in MacOS (backport #5585) (backport #5595) #5620

Merged
merged 3 commits into from
Feb 5, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 31, 2025

Description

During MacOs testing in other PR, it was detected that the DOMAIN category used in some logs EPROSIMA_LOG_...(DOMAIN) collides with a #define DOMAIN in math.h in the DeveoperTools under MacOs.
This PR solves the issue by adding a prefix depending on the domain.

@Mergifyio backport 3.1.x 3.0.x 2.14.x 2.10.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • The code follows the style guidelines of this project.

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

  • Any new configuration API has an equivalent XML API (with the corresponding XSD extension)

  • Changes are backport compatible: they do NOT break ABI nor change library core behavior.

  • 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.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • 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 #5585 done by [Mergify](https://mergify.com).
This is an automatic backport of pull request #5595 done by [Mergify](https://mergify.com).

* Fix log category name macro collision in `MacOS`  (#5585)

* Refs #22657: BB test

Signed-off-by: Mario Domínguez López <[email protected]>

* Refs #22657: Fix

Signed-off-by: Mario Domínguez López <[email protected]>

* Refs #22657: Make test available in all platforms

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #22657: Apply missing Miguels suggestion

Signed-off-by: Mario Dominguez <[email protected]>

---------

Signed-off-by: Mario Domínguez López <[email protected]>
Signed-off-by: Mario Dominguez <[email protected]>
(cherry picked from commit a59d32f)

# Conflicts:
#	src/cpp/rtps/RTPSDomain.cpp

* Fix conflicts

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
Co-authored-by: Mario Domínguez López <[email protected]>
Co-authored-by: Miguel Company <[email protected]>
(cherry picked from commit 55cf7b2)

# Conflicts:
#	src/cpp/fastdds/domain/DomainParticipantFactory.cpp
Copy link
Contributor Author

mergify bot commented Jan 31, 2025

Cherry-pick of 55cf7b2 has failed:

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

You are currently cherry-picking commit 55cf7b2a.
  (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/cpp/rtps/RTPSDomain.cpp
	modified:   test/blackbox/common/DDSBlackboxTestsBasic.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/fastdds/domain/DomainParticipantFactory.cpp

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 Backport PR wich git cherry pick failed label Jan 31, 2025
@MiguelCompany MiguelCompany added this to the v2.14.5 milestone Jan 31, 2025
Signed-off-by: Eugenio Collado <[email protected]>
@EugenioCollado EugenioCollado force-pushed the mergify/bp/2.14.x/pr-5595 branch from f3f15bd to d1755fa Compare February 3, 2025 11:43
@EugenioCollado EugenioCollado added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Feb 4, 2025
@EugenioCollado EugenioCollado self-requested a review February 4, 2025 15:32
Signed-off-by: Eugenio Collado <[email protected]>
@EugenioCollado EugenioCollado requested review from EugenioCollado and removed request for EugenioCollado February 5, 2025 07:33
Copy link
Contributor

@EugenioCollado EugenioCollado left a comment

Choose a reason for hiding this comment

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

LGTM

@EugenioCollado EugenioCollado merged commit 7eb774e into 2.14.x Feb 5, 2025
18 checks passed
@EugenioCollado EugenioCollado deleted the mergify/bp/2.14.x/pr-5595 branch February 5, 2025 13:12
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