Merge branch 'master' into jwi-getqos

RemedyIT · Oct 22, 2024 · a4bd918 · a4bd918
2 parents 786d846 + 6b5b37e
commit a4bd918
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 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
@@ -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
@@ -62,7 +62,7 @@ namespace Test_Sender_Impl
   : public IDL::traits<CCM_TT::TT_Handler>::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
@@ -30,7 +30,7 @@ class LatencyDataListener final :
   public DDS::traits<Test::LatencyData>::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
@@ -30,7 +30,7 @@ class LatencyDataListener final :
   public DDS::traits<Test::LatencyData>::datareaderlistener_type
 {
 public:
-  LatencyDataListener(TestExecutor* executor)
+  explicit LatencyDataListener(TestExecutor* executor)
     : executor_ (executor)
   {}
 

diff --git 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_ */