Skip to content

Commit

Permalink
Force use of semicolon in FASTDDS_TODO_BEFORE macro (#4452)
Browse files Browse the repository at this point in the history
Signed-off-by: EduPonz <[email protected]>
  • Loading branch information
EduPonz authored Feb 27, 2024
1 parent f46d383 commit 7a6295f
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion include/fastdds/dds/domain/DomainParticipantListener.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class DomainParticipantListener :
* @param[out] participant Pointer to the Participant which discovered the remote participant.
* @param[out] info Remote participant information. User can take ownership of the object.
*/
FASTDDS_TODO_BEFORE(3, 0, "Remove this overload")
FASTDDS_TODO_BEFORE(3, 0, "Remove this overload");
virtual void on_participant_discovery(
DomainParticipant* participant,
fastrtps::rtps::ParticipantDiscoveryInfo&& info)
Expand Down
4 changes: 2 additions & 2 deletions include/fastdds/rtps/transport/TCPTransportDescriptor.h
Original file line number Diff line number Diff line change
Expand Up @@ -251,13 +251,13 @@ struct TCPTransportDescriptor : public SocketTransportDescriptor
//! Increment between logical ports to try during RTCP negotiation
uint16_t logical_port_increment;

FASTDDS_TODO_BEFORE(3, 0, "Eliminate tcp_negotiation_timeout, variable not in use.")
FASTDDS_TODO_BEFORE(3, 0, "Eliminate tcp_negotiation_timeout, variable not in use.");
uint32_t tcp_negotiation_timeout;

//! Enables the TCP_NODELAY socket option
bool enable_tcp_nodelay;

FASTDDS_TODO_BEFORE(3, 0, "Eliminate wait_for_tcp_negotiation, variable not in use.")
FASTDDS_TODO_BEFORE(3, 0, "Eliminate wait_for_tcp_negotiation, variable not in use.");
bool wait_for_tcp_negotiation;

//! Enables the calculation and sending of CRC on message headers
Expand Down
2 changes: 1 addition & 1 deletion include/fastdds/rtps/writer/IReaderDataFilter.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
// This file was moved as part of the implementation of content filtered topics
#include <fastdds/rtps/interfaces/IReaderDataFilter.hpp>

FASTDDS_TODO_BEFORE(3, 0, "This header should be removed")
FASTDDS_TODO_BEFORE(3, 0, "This header should be removed");
2 changes: 1 addition & 1 deletion include/fastrtps/config.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
#define FASTDDS_TODO_BEFORE(major, minor, msg) \
static_assert((FASTRTPS_VERSION_MAJOR < major) || \
(FASTRTPS_VERSION_MAJOR == major && FASTRTPS_VERSION_MINOR < minor), \
"TODO before version " #major "." #minor " : " #msg);
"TODO before version " #major "." #minor " : " #msg)

#if FASTCDR_VERSION_MAJOR > 1
#define FASTDDS_SER_METHOD_DEPRECATED(major, entity_name, msg) FASTDDS_DEPRECATED_UNTIL(major, entity_name, msg)
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/transport/TCPTransportInterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ static const int s_default_keep_alive_timeout = 15000; // 15 SECONDS
//static const int s_clean_deleted_sockets_pool_timeout = 100; // 100 MILLISECONDS

FASTDDS_TODO_BEFORE(3, 0,
"Eliminate s_default_tcp_negotitation_timeout, variable used to initialize deprecate attribute.")
"Eliminate s_default_tcp_negotitation_timeout, variable used to initialize deprecate attribute.");
static const int s_default_tcp_negotitation_timeout = 5000; // 5 Seconds

TCPTransportDescriptor::TCPTransportDescriptor()
Expand Down

0 comments on commit 7a6295f

Please sign in to comment.