Skip to content

[16329] Several fixes to remove warnings in Ubuntu Jammy (22.04) (backport #3078)#3158

Closed
mergify[bot] wants to merge 1 commit into2.1.xfrom
mergify/bp/2.1.x/pr-3078
Closed

[16329] Several fixes to remove warnings in Ubuntu Jammy (22.04) (backport #3078)#3158
mergify[bot] wants to merge 1 commit into2.1.xfrom
mergify/bp/2.1.x/pr-3078

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Dec 16, 2022

This is an automatic backport of pull request #3078 done by Mergify.
Cherry-pick of d024c10 has failed:

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

You are currently cherry-picking commit d024c109e.
  (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:   doxyfile.in
	modified:   roadmap.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   include/fastdds/rtps/transport/TCPAcceptorSecure.h
	deleted by us:   src/cpp/rtps/transport/TCPChannelResourceSecure.h
	deleted by us:   src/cpp/rtps/transport/TCPTransportInterface.h
	deleted by us:   test/unittest/statistics/rtps/RTPSStatisticsTests.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Refs #16125: update doxygen configuration file

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #16125: update library name in Roadmap

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #16125: remove warning: variable may be used uninitialized

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #16125: remove OpenSSL deprecation warnings when forcing Asio as thirdparty

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
(cherry picked from commit d024c10)

# Conflicts:
#	include/fastdds/rtps/transport/TCPAcceptorSecure.h
#	src/cpp/rtps/transport/TCPChannelResourceSecure.h
#	src/cpp/rtps/transport/TCPTransportInterface.h
#	test/unittest/statistics/rtps/RTPSStatisticsTests.cpp
@mergify mergify Bot added the conflicts Backport PR wich git cherry pick failed label Dec 16, 2022
@JLBuenoLopez
Copy link
Copy Markdown
Contributor

Fast DDS 2.1.x is still supported because it is being used within ROS 2 Foxy distro.
ROS 2 Foxy is not supported in Ubuntu 22.04 so this PR can be closed.

@mergify mergify Bot deleted the mergify/bp/2.1.x/pr-3078 branch January 23, 2023 10:45
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.

1 participant