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.

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

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

Merged
merged 2 commits into from
Feb 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
790 changes: 557 additions & 233 deletions doxyfile.in

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion roadmap.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Fast RTPS Roadmap
# Fast DDS Roadmap

This product is a FIWARE Generic Enabler.
If you would like to learn about the overall Roadmap of FIWARE, please check section "Roadmap" on the FIWARE Catalogue.
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/participant/RTPSParticipantImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1676,7 +1676,7 @@ bool RTPSParticipantImpl::createReceiverResources(
while (!ret && (tries < m_att.builtin.mutation_tries))
{
tries++;
*it_loc = applyLocatorAdaptRule(*it_loc);
applyLocatorAdaptRule(*it_loc);
ret = m_network_Factory.BuildReceiverResources(*it_loc, newItemsBuffer, max_receiver_buffer_size);
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/cpp/rtps/transport/TCPAcceptorSecure.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
#ifndef _FASTDDS_TCP_ACCEPTOR_SECURE_
#define _FASTDDS_TCP_ACCEPTOR_SECURE_

#define OPENSSL_API_COMPAT 10101

#include <asio/ssl.hpp>
#include <rtps/transport/TCPAcceptor.h>
#include <rtps/transport/TCPChannelResourceSecure.h>
Expand Down
2 changes: 2 additions & 0 deletions src/cpp/rtps/transport/TCPChannelResourceSecure.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
#ifndef _FASTDDS_TCP_CHANNEL_RESOURCE_SECURE_
#define _FASTDDS_TCP_CHANNEL_RESOURCE_SECURE_

#define OPENSSL_API_COMPAT 10101

#include <asio.hpp>
#include <asio/ssl.hpp>
#include <asio/strand.hpp>
Expand Down
1 change: 1 addition & 0 deletions src/cpp/rtps/transport/TCPTransportInterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <rtps/transport/TCPChannelResourceBasic.h>
#include <rtps/transport/TCPAcceptorBasic.h>
#if TLS_FOUND
#define OPENSSL_API_COMPAT 10101
#include <rtps/transport/TCPAcceptorSecure.h>
#include <asio/ssl.hpp>
#endif // if TLS_FOUND
Expand Down
2 changes: 1 addition & 1 deletion test/unittest/statistics/rtps/RTPSStatisticsTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,7 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_listener_callbacks_fragmented)
static uint32_t max_fragment = 0;
static bool keep_filtering = true;

uint32_t fragmentNum;
uint32_t fragmentNum = 0;
uint32_t old_pos = msg.pos;
msg.pos += 20;
fastrtps::rtps::CDRMessage::readUInt32(&msg, &fragmentNum);
Expand Down