-
Notifications
You must be signed in to change notification settings - Fork 793
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)
#5595
base: 3.1.x
Are you sure you want to change the base?
Conversation
* 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
Cherry-pick of a59d32f has failed:
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 |
Signed-off-by: Miguel Company <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM with green CI
@Mergifyio backport 3.0.x 2.14.x 2.10.x |
🟠 Waiting for conditions to match
|
Description
During MacOs testing in other PR, it was detected that the
DOMAIN
category used in some logsEPROSIMA_LOG_...(DOMAIN)
collides with a#define DOMAIN
inmath.h
in the DeveoperTools underMacOs
.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
This is an automatic backport of pull request #5585 done by [Mergify](https://mergify.com).