BUILD_RTI DDS Module Guard Fixes
- Add missing m_logger member declarations to GenericDataWriter, GenericDataReader, GenericDtcImplSubscriberTemplate - Add DynamicDataImpl.hpp include for complete type in publisher.h/cpp - Wrap dds_connector.cpp implementation in #if BUILD_RTI guards - Fix stub signatures in dds_connector.h to match implementation - Set CMAKE_CXX_STANDARD to 17 (RTI 7.7.0 hard requirement) RTI Connext DDS 7.7.0 only supports C++14/C++17. C++20/23 causes header compilation errors. Cannot mix C++ variants. Remaining Qt6 issues (separate from RTI work): - QJsonDocument::toBinaryData/fromBinaryData → toJson/fromJson - QJsonObject initializer list syntax in training_area_telegrams.cpp Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
1 parent
ec75789fae
commit
8d456c7d1a
12 files changed
+22
-13
No files matched your search
@@ -6,6 +6,11 @@
|
||||
#include <string>
|
||||
#include <ddsgen_export.h>
|
||||
|
||||
#if BUILD_RTI
|
||||
#include <dds/topic/topic.hpp>
|
||||
#include <rti/core/xtypes/DynamicTypeImpl.hpp>
|
||||
#endif
|
||||
|
||||
class QObject;
|
||||
class QMetaMethod;
|
||||
|
||||
@@ -26,6 +31,8 @@ struct topic_type_name {
|
||||
#endif
|
||||
}
|
||||
};
|
||||
|
||||
#if BUILD_RTI
|
||||
template<>
|
||||
struct topic_type_name<dds::core::xtypes::DynamicData> {
|
||||
static std::string value() {
|
||||
|
||||
@@ -308,6 +308,7 @@ template <typename TOPICTYPE> class GenericDataReader
|
||||
|
||||
std::vector<SampleStruct> m_newSamplesDuringRead;
|
||||
bool m_bHaveSubscriberCallback;
|
||||
NGL::INGLLogger& m_logger;
|
||||
};
|
||||
|
||||
template <typename TOPICTYPE> class GenericDataReaderContentFilter final : public GenericDataReader<TOPICTYPE>
|
||||
|
||||
@@ -126,6 +126,7 @@ template <typename TOPICTYPE> class GenericDataWriter final
|
||||
private:
|
||||
DataWriter m_dataWriter;
|
||||
DataTopic m_ddsTopic;
|
||||
NGL::INGLLogger& m_logger;
|
||||
};
|
||||
|
||||
} // namespace DDSGeneric
|
||||
@@ -9,7 +9,7 @@ namespace DDSGeneric
|
||||
{
|
||||
|
||||
SubscriberListener::SubscriberListener()
|
||||
: m_bPrepareForShutdown(false), m_logger(DDS::getLogger("SubscriberListener", DDS::DataType::DATA_TOPIC_CLIENT))
|
||||
: m_logger(DDS::getLogger("SubscriberListener", DDS::DataType::DATA_TOPIC_CLIENT)), m_bPrepareForShutdown(false)
|
||||
{
|
||||
qRegisterMetaType<std::string>("std::string");
|
||||
DEBUG_LOG(m_logger) << "SubscriberListener initialized, this " << this;
|
||||
|
||||
Reference in new issue
Block a user