Fast-DDS icon indicating copy to clipboard operation
Fast-DDS copied to clipboard

[10173] Use absolute paths when loading XML files (backport #4751)

Open mergify[bot] opened this issue 1 year ago • 1 comments

Description

This PR forwards a refactor from the work in #1657 to master. In addition, it solves a name collision error with the variable name INTERFACE. When importing windows.h a 2275 error : illegal use of this type as an expression was caused

@Mergifyio backport 2.14.x 2.13.x 2.10.x 2.6.x

Contributor Checklist

  • [X] Commit messages follow the project guidelines.

  • [X] The code follows the style guidelines of this project.

  • [X] 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

  • [X] Any new/modified methods have been properly documented using Doxygen.

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

  • [X] Changes are ABI compatible.

  • [X] 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.

  • [X] Applicable backports have been included in the description.

Reviewer Checklist

  • [x] The PR has a milestone assigned.
  • [x] The title and description correctly express the PR's purpose.
  • [x] Check contributor checklist is correct.
  • [x] Check CI results: changes do not issue any warning.
  • [x] Check CI results: failing tests are unrelated with the changes.

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

mergify[bot] avatar May 22 '24 12:05 mergify[bot]

Cherry-pick of 0919ff294457546c72d5f8810eb61ec48b67e95e has failed:

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

You are currently cherry-picking commit 0919ff294.
  (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:   include/fastrtps/xmlparser/XMLParser.h
	modified:   include/fastrtps/xmlparser/XMLProfileManager.h
	modified:   test/unittest/dds/status/CMakeLists.txt
	modified:   test/unittest/logging/mock/MockConsumer.h
	new file:   test/unittest/xmlparser/XMLLoadFileTests.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   include/fastrtps/xmlparser/XMLParserCommon.h
	both modified:   src/cpp/rtps/xmlparser/XMLParser.cpp
	both modified:   src/cpp/rtps/xmlparser/XMLParserCommon.cpp
	both modified:   src/cpp/rtps/xmlparser/XMLProfileManager.cpp
	both modified:   test/unittest/xmlparser/CMakeLists.txt

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[bot] avatar May 22 '24 12:05 mergify[bot]

@richiprosima please test this

Mario-DL avatar May 29 '24 06:05 Mario-DL