Qt6/RTI 7.7 Migration: Build-System und RTI-Integration fixes
CMake Build-System: - NGL_ADD_SUBDIR_GUARDED() vor erstem Aufruf definiert (Zeile 38) - Z/src wird VOR ENABLE_TESTING() eingebunden - InfrastructureManagement an Anfang von Lts/Services CMakeLists.txt - ALIAS Targets für RTI nur für existierende Libraries erstellt RTI 7.7 Integration: - generic_base.h: QMetaMethod Include hinzugefügt - generic_data_reader.h: Template-Signatur auf 2 Parameter angepasst - detail::DataReaderImpl<Q> als Default-Template-Parameter Qt6 Location Support: - Dockerfile: qtlocation und qtpositioning Module hinzugefügt Dokumentation: - C++23 Inkompatibilität mit RTI 7.7 in copilot-instructions.md - EXTERNAL_DEPENDENCIES.md Strategie dokumentiert Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
1 parent
a9c5b2181e
commit
497baa804b
6 files changed
+46
-33
No files matched your search
@@ -5,10 +5,10 @@
|
||||
|
||||
#include <string>
|
||||
#include <ddsgen_export.h>
|
||||
#include <QMetaMethod>
|
||||
|
||||
// Forward declarations for Qt types used in getMethod
|
||||
class QObject;
|
||||
class QMetaMethod;
|
||||
|
||||
// Forward declaration for NGL logger
|
||||
namespace NGL {
|
||||
|
||||
@@ -9,16 +9,28 @@
|
||||
*/
|
||||
|
||||
#ifdef BUILD_RTI
|
||||
// RTI DDS is available - include the real implementation
|
||||
#include <Lts/DDS/Generic/generic_data_reader.h>
|
||||
// RTI DDS is available - include the real implementation from RTI headers
|
||||
// DataReader is already defined in <dds/sub/subfwd.hpp> with signature:
|
||||
// template <typename T, template <typename Q> class DELEGATE = dds::sub::detail::DataReaderImpl>
|
||||
// class DataReader;
|
||||
#else
|
||||
// BUILD_RTI=OFF: Provide minimal stub definitions
|
||||
|
||||
namespace dds {
|
||||
namespace sub {
|
||||
namespace detail {
|
||||
|
||||
// Dummy delegate class to serve as default template parameter
|
||||
template<typename Q>
|
||||
class DataReaderImpl {
|
||||
// Empty stub implementation
|
||||
};
|
||||
|
||||
} // namespace detail
|
||||
|
||||
// Forward declaration stub for DataReader
|
||||
template<typename T>
|
||||
// Must match RTI 7.7 signature for compatibility
|
||||
template<typename T, template <typename Q> class DELEGATE = detail::DataReaderImpl>
|
||||
class DataReader {
|
||||
public:
|
||||
// Minimal stub interface - add methods as needed by the codebase
|
||||
|
||||
@@ -91,7 +91,7 @@ public:
|
||||
, m_exerciseId(std::nullopt)
|
||||
, m_phaseId(std::nullopt)
|
||||
, m_size(0)
|
||||
, m_fileStatus(FileStatus_Valid)
|
||||
, m_fileStatus(FileStatus::Valid)
|
||||
, m_fileCategory(FileCategory::Global)
|
||||
, m_fileType(FileType::Unknown)
|
||||
, m_isTemplate(false)
|
||||
@@ -121,7 +121,7 @@ public:
|
||||
FileCategory fileCategory() const { return m_fileCategory; }
|
||||
FileType fileType() const { return m_fileType; }
|
||||
bool isTemplate() const { return m_isTemplate; }
|
||||
bool isDeleted() const { return m_fileStatus == FileStatus_Deleted; }
|
||||
bool isDeleted() const { return m_fileStatus == FileStatus::Deleted; }
|
||||
bool isHidden() const { return m_hidden; }
|
||||
bool isUsedBy() const { return m_used; }
|
||||
std::string usedBy() const { return m_usedBy; }
|
||||
|
||||
Reference in new issue
Block a user