Skip to content

[21335] Fix compilation on VS 2022 in Debug (backport #5040)#5043

Closed
mergify[bot] wants to merge 1 commit into2.14.xfrom
mergify/bp/2.14.x/pr-5040
Closed

[21335] Fix compilation on VS 2022 in Debug (backport #5040)#5043
mergify[bot] wants to merge 1 commit into2.14.xfrom
mergify/bp/2.14.x/pr-5040

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Jul 9, 2024

Description

After testing compilation on VS2022, this PR fixes compilation error in Debug.

@Mergifyio backport 2.14.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.

  • N/A 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.
  • N/A: 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 #5040 done by [Mergify](https://mergify.com).

Signed-off-by: Ricardo González <ricardo@richiware.dev>
(cherry picked from commit dff42e0)

# Conflicts:
#	src/cpp/rtps/messages/MessageReceiver.cpp
#	tools/fds/server.cpp
@mergify mergify Bot added the conflicts Backport PR wich git cherry pick failed label Jul 9, 2024
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jul 9, 2024

Cherry-pick of dff42e0 has failed:

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

You are currently cherry-picking commit dff42e0f6.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/messages/MessageReceiver.cpp
	both modified:   tools/fds/server.cpp

no changes added to commit (use "git add" and/or "git commit -a")

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 mentioned this pull request Jul 9, 2024
10 tasks
@JesusPoderoso JesusPoderoso added this to the v2.14.3 milestone Jul 9, 2024
@EduPonz
Copy link
Copy Markdown

EduPonz commented Jul 9, 2024

Looking at the changes, I don't think it makes sense to backport this.

@EduPonz EduPonz closed this Jul 9, 2024
@mergify mergify Bot deleted the mergify/bp/2.14.x/pr-5040 branch July 9, 2024 13:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

conflicts Backport PR wich git cherry pick failed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants