From 24bff2fb75c44bda9c86e0f1feced5260ad8cb40 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 7 Oct 2024 13:02:06 +0200 Subject: [PATCH 1/2] Add version check for RTI Connext DDS * ddsx11/vendors/ndds/dds/dds_common.h: --- ddsx11/vendors/ndds/dds/dds_common.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ddsx11/vendors/ndds/dds/dds_common.h b/ddsx11/vendors/ndds/dds/dds_common.h index 11e58e06a..f0a1e2479 100644 --- a/ddsx11/vendors/ndds/dds/dds_common.h +++ b/ddsx11/vendors/ndds/dds/dds_common.h @@ -17,4 +17,8 @@ #define DDSX11_INITIALIZE_QOS_DEFAULTS #include "dds/ndds_typedefs.h" +#if (RTI_DDS_VERSION_MAJOR < 7) || ((RTI_DDS_VERSION_MAJOR == 7) && (RTI_DDS_VERSION_MINOR < 3)) +# error Only RTI Connext DDS 7.3 or newer are supported +#endif + #endif /* DDSX11_IMPL_COMMON_H_ */ From cc21317228e6c77b76892df9323111312f98f5b7 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 7 Oct 2024 13:16:49 +0200 Subject: [PATCH 2/2] Minimal test changes * connectors/dds4ccm/tests/max_delivered_data/getter/receiver/mdd_getter_receiver_exec.cpp: * connectors/psdd4ccm/examples/hello/components/sender/psdd_sender_exec.cpp: * ddsx11/tests/latency/receiver/main.cpp: * ddsx11/tests/minimal_latency/receiver/main.cpp: --- .../getter/receiver/mdd_getter_receiver_exec.cpp | 1 - .../examples/hello/components/sender/psdd_sender_exec.cpp | 2 +- ddsx11/tests/latency/receiver/main.cpp | 2 +- ddsx11/tests/minimal_latency/receiver/main.cpp | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/connectors/dds4ccm/tests/max_delivered_data/getter/receiver/mdd_getter_receiver_exec.cpp b/connectors/dds4ccm/tests/max_delivered_data/getter/receiver/mdd_getter_receiver_exec.cpp index 24f9bec6e..071aef1f7 100644 --- a/connectors/dds4ccm/tests/max_delivered_data/getter/receiver/mdd_getter_receiver_exec.cpp +++ b/connectors/dds4ccm/tests/max_delivered_data/getter/receiver/mdd_getter_receiver_exec.cpp @@ -37,7 +37,6 @@ namespace MDD_Getter_Test_Receiver_Impl uint32_t round) override; private: - std::string connection_; IDL::traits<::MDD_Getter_Test::CCM_Receiver_Context>::ref_type ciao_context_; }; diff --git a/connectors/psdd4ccm/examples/hello/components/sender/psdd_sender_exec.cpp b/connectors/psdd4ccm/examples/hello/components/sender/psdd_sender_exec.cpp index 9d463c2a6..5f11f45c5 100644 --- a/connectors/psdd4ccm/examples/hello/components/sender/psdd_sender_exec.cpp +++ b/connectors/psdd4ccm/examples/hello/components/sender/psdd_sender_exec.cpp @@ -62,7 +62,7 @@ namespace Test_Sender_Impl : public IDL::traits::base_type { public: - TT_MsgCallback (IDL::traits<::Test::CCM_Sender>::weak_ref_type component_executor) + explicit TT_MsgCallback (IDL::traits<::Test::CCM_Sender>::weak_ref_type component_executor) : component_executor_(component_executor) {} diff --git a/ddsx11/tests/latency/receiver/main.cpp b/ddsx11/tests/latency/receiver/main.cpp index 8d79a8ff8..f6e1fbe05 100644 --- a/ddsx11/tests/latency/receiver/main.cpp +++ b/ddsx11/tests/latency/receiver/main.cpp @@ -30,7 +30,7 @@ class LatencyDataListener final : public DDS::traits::datareaderlistener_type { public: - LatencyDataListener(TestExecutor* executor) + explicit LatencyDataListener(TestExecutor* executor) : executor_ (executor) {} diff --git a/ddsx11/tests/minimal_latency/receiver/main.cpp b/ddsx11/tests/minimal_latency/receiver/main.cpp index 8d79a8ff8..f6e1fbe05 100644 --- a/ddsx11/tests/minimal_latency/receiver/main.cpp +++ b/ddsx11/tests/minimal_latency/receiver/main.cpp @@ -30,7 +30,7 @@ class LatencyDataListener final : public DDS::traits::datareaderlistener_type { public: - LatencyDataListener(TestExecutor* executor) + explicit LatencyDataListener(TestExecutor* executor) : executor_ (executor) {}