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.

Sign up for GitHub

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

Jump to bottom

[19139] Avoid double definition of FASTDDS_ENFORCE_LOG_INFO #3667

Merged
merged 1 commit into from
Jul 10, 2023
Merged

[19139] Avoid double definition of FASTDDS_ENFORCE_LOG_INFO #3667

merged 1 commit into from
Jul 10, 2023

Conversation

EduPonz
Copy link

@EduPonz EduPonz commented Jul 7, 2023 •
edited by JesusPoderoso
Loading

Description

Some log tests define FASTDDS_ENFORCE_LOG_INFO before including config.h (through other includes). This results in a double definition of FASTDDS_ENFORCE_LOG_INFO when compiling the CMake option -DFASTDDS_ENFORCE_LOG_INFO=ON.

@Mergifyio backport 2.10.x 2.9.x 2.6.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • The code follows the style guidelines of this project.
  • 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: Any new/modified methods have been properly documented using Doxygen.
  • Changes are ABI compatible.
  • 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.

The afected tests LogMacrosTests have all been run locally on a build using the the CMake option.

Reviewer Checklist

  • The PR has a milestone assigned.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

@EduPonz EduPonz added this to the v2.11.1 milestone Jul 7, 2023
@EduPonz EduPonz added the ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. label Jul 10, 2023
@EduPonz EduPonz merged commit a086f9c into master Jul 10, 2023
@EduPonz EduPonz deleted the hotfix/enforce_log_info_double_def branch July 10, 2023 09:52
@JesusPoderoso
Copy link
Contributor

@Mergifyio backport 2.10.x 2.9.x 2.6.x

@mergify
Copy link
Contributor

mergify bot commented Jul 10, 2023 •
edited
Loading

backport 2.10.x 2.9.x 2.6.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Jul 10, 2023
@EduPonz @mergify
Avoid double definition of FASTDDS_ENFORCE_LOG_INFO (#3667)
09d5c17 
Signed-off-by: Eduardo Ponz <[email protected]>
(cherry picked from commit a086f9c)
mergify bot pushed a commit that referenced this pull request Jul 10, 2023
@EduPonz @mergify
Avoid double definition of FASTDDS_ENFORCE_LOG_INFO (#3667)
f32094f 
Signed-off-by: Eduardo Ponz <[email protected]>
(cherry picked from commit a086f9c)
@mergify mergify bot mentioned this pull request Jul 10, 2023
Merged
mergify bot pushed a commit that referenced this pull request Jul 10, 2023
@EduPonz @mergify
Avoid double definition of FASTDDS_ENFORCE_LOG_INFO (#3667)
e3f7b4f 
Signed-off-by: Eduardo Ponz <[email protected]>
(cherry picked from commit a086f9c)
This was referenced Jul 10, 2023
Merged
Merged
EduPonz added a commit that referenced this pull request Aug 3, 2023
@mergify @EduPonz
Avoid double definition of FASTDDS_ENFORCE_LOG_INFO (#3667) (#3677)
6dfa785 
Signed-off-by: Eduardo Ponz <[email protected]>
(cherry picked from commit a086f9c)

Co-authored-by: Eduardo Ponz Segrelles <[email protected]>
MiguelCompany pushed a commit that referenced this pull request Aug 8, 2023
@mergify @EduPonz
Avoid double definition of FASTDDS_ENFORCE_LOG_INFO (#3667) (#3675)
0c31519 
Signed-off-by: Eduardo Ponz <[email protected]>
(cherry picked from commit a086f9c)

Co-authored-by: Eduardo Ponz Segrelles <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jsan-rt jsan-rt jsan-rt approved these changes

Assignees
No one assigned
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Milestone
v2.11.1
Development

Successfully merging this pull request may close these issues.
3 participants
@EduPonz @JesusPoderoso @jsan-rt